CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,647 Commits 425 Branches 1,723 Tags
fa304f33003fcf2fbce819dbc274746a05abdf67
Commit Graph

38647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
12a79dc6ac Merge pull request #28609 from frappe/mergify/bp/version-13-hotfix/pr-28556 
fix: incorrect discount amount set when item is replaced (backport #28556)
 2021-11-29 18:06:19 +05:30
rohitwaghchaure
0628aba0c7 Merge pull request #28616 from frappe/mergify/bp/version-13-hotfix/pr-28611 
fix: changed fieldtype from int to float for the field Batch Size in the Work Order Operation table (backport #28611)
 2021-11-29 17:49:47 +05:30
Deepesh Garg
fcaebc465e Merge pull request #28614 from frappe/mergify/bp/version-13-hotfix/pr-28605 
refactor(KSA VAT): QR Code as per ZATKA specification (backport #28605)
 2021-11-29 17:38:47 +05:30
Deepesh Garg
69c0e4dea1 Merge pull request #28612 from frappe/mergify/bp/version-13-pre-release/pr-28605 
refactor(KSA VAT): QR Code as per ZATKA specification (backport #28605)
 2021-11-29 17:38:26 +05:30
Rohit Waghchaure
1733c1c513 fix: changed fieldtype from int to float for the field Batch Size in the work order 
(cherry picked from commit 7fac9b8e9c)
 2021-11-29 11:44:25 +00:00
Deepesh Garg
eeaed9d730 fix: KSA print format for invoices not having item codes 
(cherry picked from commit af6fc29770)
 2021-11-29 11:17:42 +00:00
Deepesh Garg
63d29b5d01 fix: Translations 
(cherry picked from commit f3f7ed6f0d)
 2021-11-29 11:17:41 +00:00
Ahmad
7fed860654 fix: KSA VAT QR Code arabic conversion 
(cherry picked from commit 31b9b84fdf)
 2021-11-29 11:17:40 +00:00
Ahmad
ca0a6c04fb refactor: comments removed 
(cherry picked from commit de784d8bfe)
 2021-11-29 11:17:40 +00:00
Ahmad
35f4159274 refactor(KSA VAT): QR Code as per ZATKA specification 
(cherry picked from commit d1746caa02)
 2021-11-29 11:17:39 +00:00
Deepesh Garg
9348fcf6c3 fix: KSA print format for invoices not having item codes 
(cherry picked from commit af6fc29770)
 2021-11-29 11:17:04 +00:00
Deepesh Garg
3289ba92fa fix: Translations 
(cherry picked from commit f3f7ed6f0d)
 2021-11-29 11:17:03 +00:00
Ahmad
f2f00ad402 fix: KSA VAT QR Code arabic conversion 
(cherry picked from commit 31b9b84fdf)
 2021-11-29 11:17:03 +00:00
Ahmad
641043e893 refactor: comments removed 
(cherry picked from commit de784d8bfe)
 2021-11-29 11:17:02 +00:00
Ahmad
fda69bc0cf refactor(KSA VAT): QR Code as per ZATKA specification 
(cherry picked from commit d1746caa02)
 2021-11-29 11:17:01 +00:00
Saqib
acb2eec7ed fix: incorrect discount amount set when item is replaced (#28556) 
(cherry picked from commit c0cc72ec1d)
 2021-11-29 09:35:59 +00:00
mergify[bot]
2cb24c8ec5 fix: Employee Advance paid amount not updated on PE cancellation (#28572) (#28608) 
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim

(cherry picked from commit baf41fdc9c)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-29 14:44:05 +05:30
Marica
ac2af2d99c Merge pull request #28606 from marination/custom-search 
feat: Allow addition of custom product search box
 2021-11-29 14:31:49 +05:30
marination
7fec4ab88b fix: search_box_id instead of search_box_class 2021-11-29 14:23:32 +05:30
marination
9ec58dec4d fix: Sider (missing semicolon) 2021-11-29 13:59:45 +05:30
marination
ae27bbe3c0 feat: Allow addition of custom search box 
- allow passing custom search box class to bind search actions on
- this allows users to inject and get a custom search box running on any page
 2021-11-29 13:47:14 +05:30
Ankush Menat
d270b320f1 chore: correct docstring 
[skip ci]
 2021-11-29 13:37:00 +05:30
Ankush Menat
2768047c9b fix: use get_all instead of get_list for child tables 
(cherry picked from commit f862339024)
 2021-11-29 13:37:00 +05:30
mergify[bot]
3621ee234e fix(ux): allow translations (#28455) (#28590) 
* Translation

* Translations

(cherry picked from commit cdaf0a04cf)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
 2021-11-27 15:11:25 +00:00
mergify[bot]
44cdedf9a2 fix: better validation for Integration Request (#28540) 2021-11-27 16:32:04 +05:30
mergify[bot]
965bfa5c62 fix: incorrect balance for warehouses (#28583) (#28584) 
(cherry picked from commit 7ff30a4b2b)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-26 17:36:26 +05:30
Deepesh Garg
e6b3becfbb Merge pull request #28581 from frappe/mergify/bp/version-13-hotfix/pr-27348 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers (backport #27348)
 2021-11-26 14:50:12 +05:30
Deepesh Garg
03449a09ce fix: Incorrect indentation 
(cherry picked from commit 7f06c8ca57)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
125ce5dd6d fix: Add tests 
(cherry picked from commit f07f010962)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
31f95bd5d1 fix(refactor): Advance tds allocation to purchase invoice 
(cherry picked from commit 5ba3b28d69)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
e2956922dc fix: GL Entries on advance TDS allocation 
(cherry picked from commit 25d208aa8a)
 2021-11-26 08:59:29 +00:00
mergify[bot]
cf5cb70f35 fix: Use get_all instead of get_list for child doctype (#28538) (#28577) 
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype

(cherry picked from commit ca8dec0cf2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-26 14:01:04 +05:30
mergify[bot]
875b924279 fix: Customer, Supplier heatmap data not rendering (#28553) (#28575) 
* fix: adding get_timeline_data import on supplier.py, customer.py

(cherry picked from commit 2a5f663a1e)

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2021-11-26 13:37:09 +05:30
mergify[bot]
b9218b3c60 fix: over billing validation (#28573) 2021-11-26 12:46:49 +05:30
Rohit Waghchaure
a0579ece92 Merge branch 'version-13-pre-release' into version-13 v13.15.1 2021-11-26 12:38:51 +05:30
Rohit Waghchaure
652b7393dc bumped to version 13.15.1 2021-11-26 12:58:50 +05:50
mergify[bot]
eac67db985 fix: checkbox triggers get_items and sub_assembly buttons (#28558) (#28571) 
(cherry picked from commit 73bfd59846)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-26 11:54:54 +05:30
mergify[bot]
c4262210c1 fix: total stock summary UI glitch #28564 (#28566) 
fix: total stock summary UI glitch
(cherry picked from commit 87f2dcfb59)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-25 19:40:48 +05:30
Marica
90049ffff5 Merge pull request #28557 from frappe/mergify/bp/version-13-hotfix/pr-28123 
fix: Remove RM Cost column as cost is not retrievable from Job card (backport #28123)
 2021-11-25 19:09:08 +05:30
Marica
66f02b0817 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28123 2021-11-25 18:46:56 +05:30
Ankush Menat
479259c1ae Merge pull request #28560 from frappe/mergify/bp/version-13-hotfix/pr-28124 
refactor: item-warehouse based reposting (backport #28124)
 2021-11-25 18:07:27 +05:30
Ankush Menat
12e1d169d0 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28124 2021-11-25 17:48:37 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Ankush Menat
16682e452d fix: patch failure due to new doctype 
(cherry picked from commit 2b3404435b)
 2021-11-25 17:40:58 +05:30
Ankush Menat
ccb8defc0b fix: ignore permissions while creating reposts 
(cherry picked from commit 0a2964dc82)
 2021-11-25 16:43:13 +05:30
Ankush Menat
1c485a8ae4 refactor: deduplicate during repost background job 
(cherry picked from commit ed94f0f3f2)
 2021-11-25 16:43:06 +05:30
Ankush Menat
2b8950243a test: item-wh deduplication in reposting 
(cherry picked from commit 55631dd0d6)
 2021-11-25 11:08:14 +00:00
Ankush Menat
d55aac26ce perf: skip unnecessary item-wh reposts 
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a5f5)
 2021-11-25 11:08:13 +00:00
Ankush Menat
3e9d639fb5 fix: dont erase voucher_type and voucher_no for item_wh repost 
kept for tracability.

(cherry picked from commit 1d3842f03a)
 2021-11-25 11:08:12 +00:00
Ankush Menat
21f64e5eba perf: index for item-sh on repost item valuation 
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c9104f)
 2021-11-25 11:08:11 +00:00