nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 20:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,714 Commits 455 Branches 1,744 Tags
25708b36c3fc00b414908e9e6b203c50f7f3abe3
Commit Graph

38714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
25708b36c3 feat: change make_gl_entries to work with new data structure 2021-09-23 20:14:45 +02:00
barredterra
353db2f612 refactor: rename interest_amount to interest, dunning_level 2021-09-23 20:13:52 +02:00
barredterra
b1e114cd5a feat: currency section , debit_to, base_dunning_amount 2021-09-23 20:09:53 +02:00
barredterra
c53ea11abb refactor: validate totals 2021-09-23 20:04:34 +02:00
barredterra
17700a4413 refactor: remove redndant argument 2021-09-17 20:34:28 +02:00
barredterra
21366c748e refactor: tests 2021-09-17 20:34:09 +02:00
barredterra
71e93b65cb feat: hide fields in print 2021-09-17 12:16:23 +02:00
barredterra
f9f2faf457 style: use double quotes 2021-09-17 12:03:02 +02:00
barredterra
ad1fad068e reafctor: validate instead of postprocess 2021-09-17 11:58:24 +02:00
barredterra
c8c10ef06b feat: company address query + style 2021-09-17 11:43:09 +02:00
barredterra
553a869bb2 Merge branch 'develop' into payments-based-dunning 2021-09-16 17:23:35 +02:00
barredterra
eaadaf452a feat: child table triggers calculation of totals 2021-09-16 17:22:46 +02:00
barredterra
c4f0a818ad feat: address display 2021-09-16 17:22:25 +02:00
barredterra
4a98c85dba feat: address and contact queries 2021-09-16 17:21:52 +02:00
barredterra
75df843c29 refactor: remove unnecessary code 2021-09-16 17:21:25 +02:00
barredterra
5f0140f02e feat: rework dunning backend 2021-09-16 16:42:51 +02:00
barredterra
7865ef82c1 feat: rework dunning frontend 2021-09-16 16:42:22 +02:00
barredterra
cc80528b91 feat: rework doctypes 2021-09-16 16:38:36 +02:00
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
barredterra
08e53d90a5 refactor: doctype naming 
Overdue Payments -> Overdue Payment
 2021-09-16 14:09:32 +02:00
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
Rucha Mahabal
866763c16a fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
barredterra
365c0ca92c feat: restructure dunning doctype 2021-09-15 19:16:09 +02:00
barredterra
ee1070bc94 feat: filter invoices 2021-09-15 19:15:53 +02:00
barredterra
5744c6e1c0 feat: Overdue Payments table 2021-09-15 19:15:31 +02:00
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 978028c880)

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 10754831c3)

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 50fe23308a)
 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
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
DeeMysterio
aa82624f31 Merge pull request #27281 from DeeMysterio/party-specific-items 
feat: link items to supplier / customer
 2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd fix: Webform Permission for custom doctype (#26232) 
* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-14 12:49:08 +05:30
marination
9520215e2b feat: Handle Excess/Multiple Item Transfer against Job Card 
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
 2021-09-14 12:33:21 +05:30
Chillar Anand
95460d9818 fix(HR): Ignore invalid fields when updating employee details (#27456) 2021-09-14 12:00:34 +05:30
Faris Ansari
1c1b476d67 perf: Optimize get_attribute_filters (#26729) 
* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-14 11:41:19 +05:30
Rucha Mahabal
b98740b44a fix: employee advance return through multiple additional salaries (#27438) 
* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports
 2021-09-14 11:20:15 +05:30
Deepesh Garg
c7ceb37b63 Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix 
fix: cancelled sales invoices are considered in billed qty calculation
 2021-09-14 10:05:36 +05:30