CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-01 17:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,119 Commits 411 Branches 1,708 Tags
52ed3c219bee04a35567debed3a1b3201ea3b0fa
Commit Graph

32119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
52ed3c219b Merge branch 'v12-pre-release' into version-12 v12.26.0 2021-10-30 15:04:29 +05:30
Rohit Waghchaure
1e378cfde0 bumped to version 12.26.0 2021-10-30 15:24:29 +05:50
rohitwaghchaure
29f5d434d8 Merge pull request #28158 from rohitwaghchaure/v12-change-log-fix 
fix: change log
 2021-10-30 15:01:51 +05:30
Rohit Waghchaure
aa0e21e84b fix: change log 2021-10-30 15:00:32 +05:30
rohitwaghchaure
34bf2004bb Merge pull request #28157 from rohitwaghchaure/v12-pre-release 
chore: change log for v12.26.0
 2021-10-30 14:58:19 +05:30
Rohit Waghchaure
7ac656d737 chore: change log for v12.26.0 2021-10-30 14:44:31 +05:30
rohitwaghchaure
a0e4708470 Merge pull request #28130 from rohitwaghchaure/merge-v12-hotfix-into-pre-release-for-v12-26 
chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
 2021-10-29 00:48:30 +05:30
Rohit Waghchaure
e60d7ac09e fix: python2 string formatting 2021-10-28 23:11:53 +05:30
Rohit Waghchaure
d6555e8632 Merge branch 'version-12-hotfix' into 'v12-pre-release' 2021-10-28 22:19:15 +05:30
Saqib
14602178e7 Merge pull request #28076 from GangaManoj/gross-profit-backport 
feat: Make Gross Profit Report more readable
 2021-10-27 15:07:23 +05:30
GangaManoj
5f2819c9b1 fix: Add column names 2021-10-25 02:24:19 +05:30
GangaManoj
5bc7d63646 fix: Get Bundle Items 2021-10-25 02:22:27 +05:30
GangaManoj
94162e0139 fix: Get Bundle Items 2021-10-25 02:15:56 +05:30
GangaManoj
e2e751e26f fix: Remove comments 2021-10-25 02:15:31 +05:30
GangaManoj
70244cee89 fix: Get data when grouped by invoice and otherwise 2021-10-25 02:15:03 +05:30
GangaManoj
ae6e69ebd4 fix: Display only the Invoice rows in bold 2021-10-25 02:14:32 +05:30
GangaManoj
6fdf4dd03e fix: Remove base_rate and buying_rate for Invoice rows 2021-10-25 02:12:21 +05:30
GangaManoj
4aede0ea3f fix: Calculate total buying_amount for each invoice 2021-10-25 02:11:14 +05:30
GangaManoj
de660bf9c4 fix: Fetch bundle item details 2021-10-25 02:11:10 +05:30
GangaManoj
391bf86e0a fix: Fetch base_net_total for each Invoice 2021-10-25 02:10:43 +05:30
GangaManoj
452c613974 fix: Calculate total buying_amount and gross profit for each invoice 2021-10-25 02:08:40 +05:30
GangaManoj
dd7b02ad7d fix: Remove Item Code and Item Name columns 2021-10-25 02:08:39 +05:30
GangaManoj
7cc02bf861 fix: Display Items in the format Item Code: Item Name 2021-10-25 02:08:36 +05:30
GangaManoj
678960209c fix: Add items belonging to Product Bundles as children 2021-10-25 02:08:12 +05:30
GangaManoj
e4995dc9ed fix: Set initial_depth to 3 2021-10-25 02:08:12 +05:30
GangaManoj
7cf5dc7dab fix: Assign indent and parent_invoice 2021-10-25 02:08:08 +05:30
GangaManoj
e676a09c18 fix: Make Invoice row bold 2021-10-25 02:04:03 +05:30
GangaManoj
6431243ce3 fix: Display items as descendants of invoices 2021-10-25 02:04:00 +05:30
GangaManoj
49f93b347c fix: Display data in tree form 2021-10-25 02:02:02 +05:30
mergify[bot]
27e9e47ba8 chore: warning for shopify integration deprecation (backport #26701) (#28062) 
* chore: warning for shopify integration deprecation (#26701)

* chore: warning for shopify integration deprecation

* fix: warn deprecation during patch for sysadmins

(cherry picked from commit e43bdf76a5)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Ankush <ankush@iwebnotes.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-22 12:16:55 +05:30
Jannat Patel
c9f51d3cec Merge pull request #28017 from frappe/mergify/bp/version-12-hotfix/pr-27728 
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation (backport #27728)
 2021-10-20 14:57:52 +05:30
Jannat Patel
9ae3f26dbf fix: conflicts 2021-10-20 12:34:04 +05:30
Goh Yan Chang
ad736f1789 Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)

# Conflicts:
#	erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
 2021-10-20 06:58:37 +00:00
Ankush Menat
16ece12516 fix: py2 compatible string formatting 2021-10-09 18:12:07 +05:30
Gavin D'souza
c9e75d2ab5 fix(patch): Handle NULL values from fieldtype change 2021-10-09 18:08:46 +05:30
mergify[bot]
985fdade7e fix(asset): expected value after useful life validation (#27791) 2021-10-05 14:14:52 +05:30
Saqib
10c34da174 fix: unexpected keyword argument 'as_dict' (#27799) 2021-10-05 13:13:20 +05:30
mergify[bot]
d1480be596 fix: set item uom as stock_uom if it isn't set (backport #27623) (#27781) 
* fix: set item uom as stock_uom if it isn't set (#27623)

* fix: set item uom as stock_uom if it isn't set

(cherry picked from commit 5c372202d5)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.js

* fix: resolve conflicts

[skip ci]

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-04 22:50:11 +05:30
Noah Jacob
93a744dc12 fix: empty row on new maintenance visit. (#27626) 
* fix: empty row on new maintenance visit.

* fix: check if rows exist
 2021-09-30 15:40:37 +05:30
Saqib
a2b98bb80c fix: cannot delete a project if linked with sales order (#27690) 2021-09-28 19:47:08 +05:30
Frappe PR Bot
4fdff12242 fix: set item.qty as mandatory (#27681) 
* fix: set item.qty as mandatory in picklist (#27680)

(cherry picked from commit b91333afdd)

# Conflicts:
#	erpnext/stock/doctype/pick_list_item/pick_list_item.json

* fix: resolve conflicts

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-28 07:48:37 +00:00
Jannat Patel
9c9cde48ad Merge pull request #27679 from pateljannat/revert-27037-salary-component-account-filter 
Revert "fix: salary component account filter"
 2021-09-28 11:44:34 +05:30
pateljannat
999a3f1305 Revert 'fix: salary component account filter' 2021-09-28 10:32:33 +05:30
mergify[bot]
8139672c7a fix: Validate if item exists on uploading items in stock reco (#27538) (#27593) 
* fix: Validate if item exists on uploading items in stock reco

- Uploading non existent item in stock reco and then changing warehouse or batch gave an error
- Check for non existent item

* chore: translation

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-20 18:19:14 +05:30
Frappe PR Bot
7169a4c113 fix(plaid): query to check if bank account exists (#27594) 2021-09-20 16:41:26 +05:30
Rohit Waghchaure
bc960ab35f Merge branch 'v12-pre-release' into version-12 v12.25.0 2021-09-20 16:33:16 +05:30
Rohit Waghchaure
f9e9c5f637 bumped to version 12.25.0 2021-09-20 16:53:16 +05:50
rohitwaghchaure
fbc8fb36dd Merge pull request #27599 from rohitwaghchaure/added-change-log-v12-25-0 
chore: change log for v12.25.0
 2021-09-20 16:31:22 +05:30
Rohit Waghchaure
6359e69503 chore: change log for v12.25.0 2021-09-20 16:28:15 +05:30
rohitwaghchaure
1d68d12b7a Merge pull request #27590 from rohitwaghchaure/merge-v12-hotfix-pre-release-for-v12-24-0 
chore: merge version-12-hotfix into version-12-pre-release
 2021-09-20 13:26:44 +05:30