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

6341 Commits

Author SHA1 Message Date
Saqib Ansari
faca478317 fix: payment amount showing in foreign currency 2021-04-12 15:40:27 +05:30
Saqib
49336b8065
fix: consolidated sales invoice posting date (#25119) 2021-04-12 12:17:50 +05:30
prssanna
42f4a00c88 fix: declare data before assigining 2021-04-12 12:01:20 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice (#25029) 
* fix: Item wise tax rate for consolidated POS invoice

* fix: Do not alter item wise taxes for consolidated invoices

* fix: Add test case

* fix: Update

* fix: Set opening stock for test item

* fix: Add valuation rate for opening stock
 2021-04-12 10:56:47 +05:30
Rohit Waghchaure
a5d062453e feat: added test case 2021-04-10 10:49:31 +05:30
Rohit Waghchaure
cb6494876f feat: purchase receipt creation from purchase invoice 2021-04-10 10:49:30 +05:30
Rohit Waghchaure
b9aa775f3b fix: pricing_rule test cases 2021-04-10 10:45:28 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision 
fix: Precision issues while allocating advance amount
 2021-04-09 21:39:02 +05:30
Saqib
4191e7999d
chore: add error title 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-08 21:04:56 +05:30
barredterra
09c7598a67 fix: make account field non-mandatory 2021-04-07 20:03:33 +02:00
Saqib Ansari
5541aeaa82 fix: keyerror while validating coa file 2021-04-07 12:34:20 +05:30
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade (#25220) 2021-04-07 10:57:46 +05:30
Sagar Vora
c9cdf74dc5
test: remove print() (#25205) 2021-04-05 16:38:10 +05:30
Sagar Vora
8aacd341c7
test: disable shopping cart before running Tax Rule tests (#25183) 2021-04-03 23:01:16 +05:30
Sagar Vora
f6b1fa0a1c
test: clear tax rules before making POS Invoices (#25171) 2021-04-03 16:06:41 +05:30
Rucha Mahabal
0773d6772d
fix(POS): local variable 'customer_currency' referenced before assignment (#25137) 2021-04-01 17:47:19 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series (#25134) 2021-04-01 16:52:28 +05:30
Walstan Baptista
58625674f4
test: correct naming series to avoid ValidationError (#25132) 2021-04-01 15:55:37 +05:30
Sagar Vora
4c31fbb687
fix(India): create property setters for shorter naming series (as per GST Rules) (#25128) 2021-04-01 15:32:37 +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
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +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
Sagar Vora
4e07695a08
test: use insert instead of save (#25045) 
* test: use insert instead of save

* test: use do_not_save
 2021-03-31 18:33:27 +05:30
Anupam
ad520e08ba feat: price margin in buying 2021-03-31 18:31:12 +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
Prssanna Desai
45eccfafc1
fix: do not set standard link in Sales Invoice as custom (#25096) 2021-03-31 16:16:00 +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
Rohan
99a8cb7143
fix: commit individual SLE rename for large datasets (#25084) 2021-03-31 15:22:00 +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
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Saqib
df1ef6f8e5
fix: make round off GLE always non-opening (#25087) 2021-03-31 14:23:09 +05:30
Deepesh Garg
5d73d8281b fix: Remove unintentionally added field 2021-03-31 14:10:56 +05:30
Deepesh Garg
f54d596ae1 fix: Precision issues while allocating advance amoount 2021-03-31 14:06:02 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying (#25058) 2021-03-30 12:09:46 +05:30
rohitwaghchaure
b38ea0cc8b
fix: patch (#25014) 
* fix: patch

* fix: pricing_rule test cases
 2021-03-28 15:51:32 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError (#25044) 2021-03-27 20:30:26 +05:30
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad test: sets is_purchase_item while item creation 2021-03-27 12:54:49 +05:30
walstanb
9826ac4602 test: reset session user if test errors 2021-03-27 12:54:49 +05:30
walstanb
98dcf8a1fd fix: type casting for None type value 2021-03-27 12:54:49 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Rohit Waghchaure
0486276789 fix: don't club same free item 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811 fix: nonetype object has no attribute options 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840 feat: recursive product discount 2021-03-26 19:05:43 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report (#24983) 2021-03-23 21:11:06 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload (#24972) 2021-03-23 10:45:20 +05:30
Deepesh Garg
d1f15b2a88
fix: TDS check getting checked after reload (#24973) 2021-03-23 10:45:06 +05:30