Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,271 Commits 3 Branches 0 Tags 1 GiB
547fd31a37
Commit Graph

35271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh
547fd31a37 bumped to version 13.0.1 2021-04-07 11:33:40 +05:50
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade (#25220) 2021-04-07 10:57:46 +05:30
Saurabh
d05686d27d Merge branch 'version-13-pre-release' into version-13 2021-04-01 22:59:49 +05:30
Saurabh
e7b3047eca chore: Bump version to v13.0.0 2021-04-01 22:59:28 +05:30
Anuja Pawar
87dea3923b
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106) 
* fix: picked qty from Stock Qty to Qty in DN

* fix: suggested changes and added test

* fix: sider changes

* fix: sider changes
 2021-04-01 22:05:08 +05:30
Saurabh
f9b9298a6d
fix: reload doc in patch (#25144) 2021-04-01 21:59:35 +05:30
Jannat Patel
c01b2caaa3
fix: serial no refresh issue (#25129) 2021-04-01 20:48:51 +05:30
Suraj Shetty
5921f434b6
Merge pull request #25142 from surajshetty3416/fix-get_route_options_for_new_doc-version-13-pre-release 
fix: get_route_options_for_new_doc for Project
 2021-04-01 19:59:51 +05:30
Suraj Shetty
c5347c4a34 fix: get_route_options_for_new_doc for project 2021-04-01 19:59:29 +05:30
Nabin Hait
db5f0f79b1
chore: added v13 change log (#25140) 2021-04-01 19:59:02 +05:30
Rucha Mahabal
0773d6772d
fix(POS): local variable 'customer_currency' referenced before assignment (#25137) 2021-04-01 17:47:19 +05:30
Marica
f4e7e72f67
Merge pull request #25131 from marination/qc-back-update-pre-release 
fix: Query values incorrectly escaped while back updating Quality Inspection
 2021-04-01 17:39:56 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series (#25134) 2021-04-01 16:52:28 +05:30
marination
a3da206b64 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 15:45:33 +05:30
Rucha Mahabal
6717773c28
fix: Travis (#25078) 
* fix(test): set default accounts in mode of payment

* fix(test): import_doc params in shopify settings test

* fix: syntax error in salary slip test

* fix(test): use Temporary Opening account for Stock Reco opening entry

* fix(test): skip GST doc naming validations for tests

* fix(test): Salary Structure Assignment date edge case

* fix(test): GST doc naming validations

* fix: sider

* revert: skip GST doc naming validations for tests
 2021-04-01 15:30:34 +05:30
Nabin Hait
7f7b3608bb fix: merge conflict 2021-04-01 15:05:53 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
rohitwaghchaure
bee9c73730
Merge pull request #25125 from rohitwaghchaure/repost-not-completed-transactions-v13-pre 
fix: repost not completed backdated transactions
 2021-04-01 15:00:43 +05:30
Rohit Waghchaure
58ca5a7329 fix: repost not completed backdated transactions 2021-04-01 14:59:49 +05:30
Rucha Mahabal
d765b21825
fix: Salary Structure object has no attribute set_totals (#25114) 2021-04-01 14:39:52 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:21:41 +05:30
Afshan
2fef245607
fix: don't set Company:company:default_currency as default for currency link fields (#25111) 2021-03-31 21:57:04 +05:30
marination
85a7ec91a1 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:07:59 +05:30
Anupam Kumar
35415fa575
fix: added flag for dont_fetch_price_list_rate in transaction (#25083) 2021-03-31 19:39:33 +05:30
Prssanna Desai
9920d4062c
Merge pull request #25103 from prssanna/redesign-fixes-v13 2021-03-31 19:02:10 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta 
feat: price margin in buying
 2021-03-31 18:38:58 +05:30
Prssanna Desai
e9236ab60f
Merge pull request #25102 from prssanna/pos-print-v13 2021-03-31 18:36:07 +05:30
Anupam
ad520e08ba feat: price margin in buying 2021-03-31 18:31:12 +05:30
prssanna
bcd63f04da style: missing semicolon 2021-03-31 18:26:52 +05:30
prssanna
5cdb1cb7a9 fix: item variant dialog dropdown issue 2021-03-31 18:26:45 +05:30
prssanna
56ab3fb132 fix: issue web list style 2021-03-31 18:26:37 +05:30
prssanna
b5843dbdcd fix: print recepit dialog 2021-03-31 18:21:51 +05:30
prssanna
b6ce868199 fix: POS print receipt 2021-03-31 18:21:38 +05:30
Rucha Mahabal
75ce336c84
chore: add sider config (#24892) (#25098) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>

Co-authored-by: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 16:27:20 +05:30
Jannat Patel
c814aab0b6
fix: delivery note print error (#25081) 2021-03-31 16:24:31 +05:30
Prssanna Desai
c5ae9ee0e1
fix: do not set standard link in Sales Invoice as custom (#25097) 2021-03-31 16:16:12 +05:30
Deepesh Garg
c482c9592f
fix: Purchase from registered composition dealer (#25057) 
* fix: Purchase from registered composition dealer

* fix: Test case for GSTR 3b report
 2021-03-31 16:04:46 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments (#25089) 
* feat: discount configuration on early payments

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* fix: remove duplicate patch call

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:52:51 +05:30
Saqib
4d0939de8d
feat: introduce parameter group in quality inspection (#25094) 
* feat: introduce parameter group in quality inspection

* chore: make parameter group optional
 2021-03-31 15:51:48 +05:30
rohitwaghchaure
968885af26
Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:30 +05:30
Rohit Waghchaure
94c145f3c3 fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:28:26 +05:30
Saqib
f239dbdd03
feat: tax collected at source using tax withholding category (#25090) 
* refactor: tax withholding category against customer

* feat: pan and tax withholding category fields for customer

* fix: test

* feat: charging tcs on sales invoice

* fix: tcs chargable amount

* fix: tcs amount calculation

* fix: sider
 2021-03-31 15:15:29 +05:30
Marica
f4426c825e
Merge pull request #25079 from marination/drop-ship-pre-release 
fix: PO not created against all selected suppliers (drop shipping)
 2021-03-31 14:36:34 +05:30
Saqib
df1ef6f8e5
fix: make round off GLE always non-opening (#25087) 2021-03-31 14:23:09 +05:30
rohitwaghchaure
83b3e87497
Merge pull request #25076 from rohitwaghchaure/fixed-bom-stock-calculated-report 
fix: bom stock calculated report
 2021-03-31 13:51:32 +05:30
marination
59bff8a2f1 fix: Test 
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
 2021-03-31 13:17:25 +05:30
marination
1b903e39c8 fix: Sider (unused variables) 2021-03-31 13:17:13 +05:30
marination
1999ae0a91 fix: PO not created against all selected suppliers (drop shipping) 
- Return list of created POs instead of first doc
- test case added
 2021-03-31 13:17:00 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists (#25064) 2021-03-31 12:44:03 +05:30
Sagar Vora
368cb45147
fix(Italy): setup, validations, optimisations (#25065) 2021-03-31 12:43:33 +05:30