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

6928 Commits

Author SHA1 Message Date
Marica
0278646fd8
fix: Cashier query in POS Opening/Closing Entry (#25399) 2021-04-20 12:53:33 +05:30
Marica
125c3d64a9
fix: Cashier query in POS Opening/Closing Entry (#25398) 2021-04-20 12:53:22 +05:30
Afshan
de69a1186c
Merge branch 'develop' into dimension-wise-accounts-balance-reports 2021-04-20 11:43:28 +05:30
Marica
b91fcbd70e
fix: Ignore Customer Group Perm on AlL Products page (#25396) 2021-04-19 22:21:07 +05:30
Marica
846200d069
fix: Ignore Customer Group Perm on AlL Products page (#25397) 2021-04-19 22:20:01 +05:30
Raffael Meyer
4a1159408a
Merge branch 'develop' into feature/check-field-subscription-invoice 2021-04-19 16:40:35 +02:00
Meike Nedwidek
ebbcc90d89 ✨ add check field for subscription invoices if they should be submitted automatically 2021-04-19 15:28:37 +02:00
Deepesh Garg
135b852cf0 fix: Use party account currency 2021-04-19 17:27:26 +05:30
Afshan
0e949adea5
Merge branch 'develop' into dimension-wise-accounts-balance-reports 2021-04-19 14:04:49 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt (#24854) 
* feat: Role to allow  over billing, delivery, receipt

* fix: Typo
 2021-04-19 13:25:15 +05:30
Deepesh Garg
bb746fcbe4 fix: Updated filters for process statement of accounts 2021-04-19 12:19:31 +05:30
Saqib
e782531529
fix: Apply single transaction threshold on net_total instead of supplier credit amount (#25243) 
* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 10:15:51 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing (#25348) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-17 15:38:47 +05:30
Saqib
18c7815a1b
fix: presentation currency in statement of accounts (#25367) 2021-04-17 15:37:40 +05:30
rohitwaghchaure
1254af502b
Merge pull request #25362 from anupamvs/disable_rounded_total 
feat: added Disable Rounded Total in sales transactions
 2021-04-17 13:30:24 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation (#25371) 
* fix: implicit string concatenations

* chore: rerun healthcare patch for company fields
 2021-04-16 22:08:44 +05:30
Saqib
36247faf1a
fix(e-invoicing): add company validation for e-invoicing (#25349) 
* fix(e-invoicing): add company validation for e-invoicing

* fix: test
 2021-04-16 18:45:19 +05:30
Raffael Meyer
6daae681bd
Merge branch 'develop' into datev_fixes 2021-04-16 12:37:14 +02:00
Anupam
9d9c256e70 feat: added Disable Rounded Total in sales transactions 2021-04-16 00:11:40 +05:30
Afshan
2da6ab7f2a
Merge branch 'develop' into dimension-wise-accounts-balance-reports 2021-04-15 18:07:04 +05:30
Saqib
593071bd53
fix: currency symbol in bank transaction list view (#25336) 2021-04-15 14:12:11 +05:30
Nabin Hait
1bc65ddbe4
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-14 11:23:34 +05:30
m1ngaa
f68205468c
Delete accounts (an empty file) 
This file has no purpose, and must've been included as a tiny mistake..?
 2021-04-14 05:50:31 +08:00
Afshan
82ebc47ba1
Merge branch 'develop' into dimension-wise-accounts-balance-reports 2021-04-13 19:38:04 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes (#25314) 
* fix: GST on freight charge in e-invoicing

* feat(india): bulk e-invoice generation (#24969)

* fix: cannot fetch e invoice settings

* fix: patch condition (#25301)

* fix: patch condition

* fix: except einvoice loading error seperately

* fix: json.loads error

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-04-13 18:49:03 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Suraj Shetty
36083ff36c
Merge pull request #25310 from rmehta/grid-field-fix 2021-04-13 12:40:27 +05:30
Suraj Shetty
82d0a1a13e style: Add missing semicolons 
- & make formatting consistent
 2021-04-13 12:35:42 +05:30
Rushabh Mehta
3c58fd4d5e fix(minor): fix dynamically changing grid properties 2021-04-13 12:05:10 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Abdullah Abouzekry
20140425c8
fix: sales order not saving due type mismatch in promo scheme (#24748) (#25222) 2021-04-13 11:36:39 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +05:30
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
Afshan
c42318ec24 chores: clean up 2021-04-09 17:44:30 +05:30
Afshan
31b5dfe9ee feat: Dimension-wise Accounts Balance Report 2021-04-09 16:52:14 +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