Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,481 Commits 3 Branches 0 Tags 1 GiB
1347187a30
Commit Graph

2756 Commits

Author SHA1 Message Date
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering (#28553) 
* fix: adding get_timeline_data import on supplier.py, customer.py
 2021-11-26 12:58:43 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387) 
* feat: create party link from customer/supplier

* test: create_party_link method
 2021-11-22 12:23:23 +05:30
Rohit Waghchaure
7472760ea3 fix: performance to submit the JV 2021-11-17 11:16:52 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message 
fix: Sales Order cancellation message
 2021-11-15 18:51:30 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388) 
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-11-15 16:08:15 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050) 
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:36:27 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
marination
734b57deec fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos
 2021-11-02 18:34:55 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
GangaManoj
1a9d2684e2 fix: Remove debugger 2021-10-28 19:27:45 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 14:44:34 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Saqib
cc07c71bbd
Merge branch 'develop' into fix-so-cancellation-message 2021-10-27 15:19:18 +05:30
GangaManoj
4789c3423d fix: Linters 2021-10-27 05:25:32 +05:30
GangaManoj
07b25c4275 fix: Import statements 2021-10-27 05:20:31 +05:30
GangaManoj
54a0f5d04f fix: Make import statements fit conventions 2021-10-27 05:15:44 +05:30
GangaManoj
6dbc47f225 fix: Rename variables 2021-10-27 05:09:44 +05:30
GangaManoj
7454167725 fix: Remove redundant code 2021-10-27 05:08:11 +05:30
GangaManoj
69e011bf6a fix: Add test to check if SO can be cancelled after linked Work Order has been submitted 2021-10-27 05:07:16 +05:30
GangaManoj
9ec24d4915 fix: Add test to check if SO can be cancelled after linked Maintenance Visit has been submitted 2021-10-27 04:46:59 +05:30
GangaManoj
80ce3e6de7 fix: Add test to check if SO can be cancelled after linked Maintenance Schedule has been submitted 2021-10-27 04:17:21 +05:30
GangaManoj
60119f5ce5 fix: Remove redundant validations 2021-10-26 21:42:58 +05:30
GangaManoj
aac574579a fix: Add test to check if SO can be cancelled when linked DN has been submitted 2021-10-26 21:42:58 +05:30
GangaManoj
21798d8836 fix: Add test to check if SO can be cancelled when linked SI has been submitted 2021-10-26 21:42:58 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30
Deepesh Garg
e3ae8d5a1e fix: Move PAN field from standard doctype to fixtures for India 2021-10-24 17:24:25 +05:30
Faris Ansari
8b547e39a8 feat: Taxes template for selling/buying doctypes 
Depends on the new Print Format Builder
frappe/frappe#14134
 2021-10-21 12:06:02 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
Ankush Menat
8d69ec72a6 fix: remove transaction commit from tests 2021-10-12 16:17:15 +05:30
mergify[bot]
e85c6e3fc5
fix: SO delivery Date not getting set via data import (#27862) (#27864) 
* fix: SO delivery Date not getting set via data import

* fix: logic to add delivery dates

* fix: linting issue

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
(cherry picked from commit d9a219850a02539f82929b5d5490554835fcde8b)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-10-08 13:19:56 +05:30
Afshan
4c16bd5c73
Merge branch 'develop' into fix-so-cancellation-message 2021-10-05 11:52:48 +05:30
Komal-Saraf0609
b483f173a6
fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769) 
* fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it

* fix: sider issues

* chore: dead code
 2021-10-04 15:42:43 +05:30
GangaManoj
6e5a3c0ea4 fix: Display draft invoices only once in error message 2021-10-02 02:15:17 +05:30
GangaManoj
99edc9c83a fix: Display message to delete linked invoices in the draft state 2021-10-02 02:03:29 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company
 2021-09-29 15:54:35 +05:30
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30