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

1445 Commits

Author SHA1 Message Date
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields (#31392) 
fix(UX): hide UOM-related fields if they are inconsequential
 2022-06-17 15:10:21 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier (#31302) 2022-06-09 19:18:52 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center 
fix: Parent dimension filters in orders
 2022-06-06 08:58:40 +05:30
Deepesh Garg
3f376cc3a5 fix: Parent dimension filters in orders 2022-06-02 13:57:54 +05:30
Deepesh Garg
a6beafbc3c fix: Permission for selling and buying settings 2022-05-31 19:41:46 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30
Marica
38e0105125
Merge pull request #30818 from Havenir/feat-request-for-quotation 
feat: request_for_quotation - show supplier name
 2022-05-13 12:16:23 +05:30
Wolfram Schmidt
0bbed414f8
feat: add Link to Opportunity (#30614) 
Adding Link to Opportunity

Following the process of Opportunity to Quotation I added a section and link field to Opportunity for a backlink when using "create"-> Request for Quotation from Opportunity.
 2022-05-13 11:59:45 +05:30
marination
90a8e924f5 fix: set_missing_values in SE and re-use the same on all SE mappings 
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
 2022-05-11 14:54:22 +05:30
Ahmad
458f2fcd62
Merge branch 'develop' into feat-request-for-quotation 2022-05-06 11:54:07 +05:00
Ahmad
04c96b547e feat: request_for_quotation - refactor 
- Set supplier as link in while selecting supplier to create quotation
 2022-05-02 18:05:21 +05:00
Ahmad
b226e7d2ac feat: request_for_quotation 
- Show supplier name if supplier ID is not equal to supplier name
 2022-04-27 12:16:03 +05:00
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency 2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
rahib-hassan
ebb7bc201b fix: library import formatting 2022-04-18 14:53:45 +05:30
rahib-hassan
52fd804aed Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account 2022-04-18 14:13:46 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
4130493b58 fix: Label typo 2022-04-14 16:03:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-04-13 19:10:19 +05:30
rahib-hassan
1babc5f367 feat: separated discount accounting settings for sales and purchase 2022-04-08 08:05:10 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
0a3cdc2623 chore: rename "is_subcontracted" field label to "Is Subcontracted" 2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 
fix: Do not update ignore pricing rule check implicitly
 2022-03-16 12:32:25 +05:30
Deepesh Garg
1f79b47a17 fix: Do not update ignore prcing rule check implicitly 2022-03-16 11:55:43 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable 
fix: Do not update ignore prcing rule check implicitly
 2022-03-14 21:46:24 +05:30
marination
a579a211fd chore: Re-arrange fields for consistency with base currency LHS 2022-03-14 16:15:12 +05:30
marination
dcd88ddc87 fix: Add missing currency option in Supplier Quotation's rounded_total field 2022-03-14 15:57:24 +05:30
Deepesh Garg
96b5cedcf8 fix: Do not update ignore prcing rule check implicitly 2022-03-13 17:48:37 +05:30
Sagar Vora
3d45f3a6a8 Merge remote-tracking branch 'upstream/develop' into remove-india 2022-03-03 10:20:50 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items 2022-03-02 12:13:56 +05:30
Ankush Menat
829c453cb6 test: remove transaction commits from buying module 2022-02-28 17:36:58 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-28 11:35:42 +05:30
Sagar Vora
5159e2e6c5 refactor: remove India specific code 2022-02-25 11:36:18 +05:30
Saqib Ansari
2f1709dfef
chore: remove unintentional search index 2022-02-24 15:12:35 +05:30
Saqib Ansari
1e139cf9a1
chore: remove unintentional search index 2022-02-24 15:12:12 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
Saqib Ansari
8005fee656 feat: update ordered qty for packed items 2022-02-22 15:06:19 +05:30
Sagar Vora
08a391fa88
test: set correct DocType (#29819) 2022-02-16 10:56:57 +05:30
Ankush Menat
77be98295c fix: update bin modified timestamp when updating qty 
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.
 2022-02-11 11:54:58 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580) 
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 01:00:37 +05:30