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

40443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Subin Tom
0ff7367f39
fix: Tax Breakup table headers fix (#27596) 2021-09-20 16:13:36 +05:30
Saqib
ef66beec51
fix(plaid): query to check if bank account exists 2021-09-20 15:33:29 +05:30
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +05:30
Ankush Menat
648b2d72a5
perf: extract loop invariant db calls 2021-09-20 15:27:12 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer (#27584) 2021-09-20 11:12:39 +05:30
GangaManoj
164a2ad28d fix: Calculate depreciation_left accurately 2021-09-20 04:33:30 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-18 13:34:27 +05:30
rohitwaghchaure
bf2a590332
fix: View Stock / Accounting Ledger button not showing in the stock entry (#27570) 2021-09-17 18:39:21 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-17 10:39:03 +05:30
Marica
41f11eca72
fix: Remove duplicates from customer_code field (#27555) 2021-09-17 10:27:29 +05:30
Ahmad
0ab57d49c1 fix: pre-commit hooks 2021-09-17 01:54:59 +05:00
Ahmad
9dae36b81d fix: pre-commit hooks 2021-09-17 01:51:32 +05:00
Ahmad
4ec733fcc0 fix: pre-commit hooks 2021-09-17 01:46:45 +05:00
Ahmad
f1e5a64c61 refactor (regional): KSA utils 2021-09-17 01:33:32 +05:00
Ahmad
05321d7f4e
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 01:28:52 +05:00
Ahmad
95b3b9c8f5
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 01:27:37 +05:00
Ahmad
940db71a82 fix: indentations 2021-09-17 01:14:41 +05:00
Subin Tom
5c18654113 fix: Renamed child table doctype, delete taxes for non nexus state 2021-09-17 00:10:41 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group (#27471) 
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-16 19:33:57 +05:30
Saqib
5eba1ccd51
fix: no validation on item defaults (#27393) 
* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 17:31:37 +05:30
Ankush Menat
557d9516ff
ci: comment about coverage after min. 3 builds (#27544) 
[skip ci]
 2021-09-16 17:17:10 +05:30
Marica
9b388883d3
fix: Validate if item exists on uploading items in stock reco (#27538) 
* 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: Ankush Menat <ankushmenat@gmail.com>
 2021-09-16 15:47:17 +05:30
Ankush Menat
78fe92542c
fix(ProdPlan): Get SubAssy Items does not work (#27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched
 2021-09-16 15:34:50 +05:30
Subin Tom
11bd42467e
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:15 +05:30
Subin Tom
435a5e4fa3
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:42:06 +05:30
Subin Tom
486d7c3a39
Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:48 +05:30
Subin Tom
0e527311b9
Update erpnext/erpnext_integrations/taxjar_integration.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-16 14:41:38 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
rohitwaghchaure
e6a1ad8016
fix: not able to submit stock entry with 350 items (#27523) 2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e
test: automated test for running all stock reports (#27510) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular
 2021-09-15 19:24:35 +05:30
Frappe PR Bot
29dab0699c
fix(minor): Remove b2c limit check from CDNR Invoices (#27516) (#27520) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format

(cherry picked from commit 978028c880445362afc0cfca9118424174541cc7)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 19:12:02 +05:30
Noah Jacob
5e0b21582a
fix: table data deleted on submitted maintenance schedule (#27513) 2021-09-15 17:37:52 +05:30
Frappe PR Bot
d4d5e2786f
fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27478) 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive

(cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card (#27483) 2021-09-15 16:45:57 +05:30
Frappe PR Bot
6e7945fbb7
fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) (#27506) 
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343

* fix: Linting issues

* fix: remove unnecessary caching

[skip ci]


Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>

(cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)
 2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier (#27398) 2021-09-15 10:24:26 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity (#27464) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases
 2021-09-15 00:37:41 +05:30
Subin Tom
3bb60a439a fix: sales_tax attribute in api call before submit 2021-09-14 22:04:57 +05:30
Subin Tom
b01fe1c3e2 fix: TaxJar update - nexus, selective api call 2021-09-14 20:42:47 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates (#27489) 2021-09-14 20:28:48 +05:30
Ankush Menat
fea51f4082
chore: isort 
[skip ci]
 2021-09-14 19:04:47 +05:30
Marica
8fed8da9eb
Merge pull request #27475 from marination/job-card-excess-transfer 
fix: Handle Excess/Multiple Item Transfer against Job Card
 2021-09-14 17:13:23 +05:30
Marica
de9f78350b
Merge branch 'develop' into job-card-excess-transfer 2021-09-14 16:50:06 +05:30
marination
469bb8d977 test: Work Order Material Transfer against Job Card 
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
 2021-09-14 16:27:39 +05:30
Ahmad
8a42570c96 refactor(regional): moved methos to region specific utils for KSA 2021-09-14 14:45:23 +05:00
Ahmad
de01066ef5
Update erpnext/regional/saudi_arabia/setup.py 
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:29:45 +05:00
Ahmad
0950713e4c
Update erpnext/regional/saudi_arabia/setup.py 
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:29:33 +05:00
Ahmad
6985ca210e
Refactor erpnext/regional/__init__.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-14 14:28:57 +05:00