nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,464 Commits 401 Branches 1,698 Tags
910b9bc3f4bdf9149dd99e4e3479ea82c8f1a9b2
Commit Graph

37464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
910b9bc3f4 fix: braintree payment processed twice (#27327) 2021-09-03 14:45:12 +05:30
Suraj Shetty
513822488e Merge pull request #24603 from marination/e-commerce-refactor 2021-09-03 14:07:52 +05:30
Deepesh Garg
1a17f0f844 Merge pull request #26129 from deepeshgarg007/gstr_1_cdnr_unregistered_json 
feat: CDNR Unreg json generation
 2021-09-03 13:53:35 +05:30
Marica
853f479f58 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-09-03 13:47:30 +05:30
marination
9d05b2ebfb test: Set Price list and company in data engine test setup 2021-09-03 13:46:28 +05:30
Deepesh Garg
6a9dcf2558 fix: Patch error and tests 2021-09-03 12:40:13 +05:30
Saqib
0cc301a82b Merge pull request #27319 from GangaManoj/backport-product-bundle-handling 
feat: Improve Product Bundle handling
 2021-09-03 12:28:51 +05:30
Frappe PR Bot
0228db1e61 fix: south africa vat patch failure (#27325) 
* fix: south africa vat patch failure (#27323)

reload doc is necessary on new doctypes

(cherry picked from commit d1fe060e4a)

# Conflicts:
#	erpnext/patches/v13_0/add_custom_field_for_south_africa.py

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 12:26:41 +05:30
Deepesh Garg
37e7b3e3ac fix: Patch 2021-09-03 11:18:24 +05:30
Saqib
115fb944c2 fix: undo unintentional changes 2021-09-03 11:06:20 +05:30
Deepesh Garg
20c7237de6 fix: Patch and linting errors 2021-09-02 22:01:24 +05:30
GangaManoj
debffbfb2d fix: Trim trailing whitespaces 2021-09-02 20:53:53 +05:30
GangaManoj
17bf32d8dc fix: Add Product Bundle field in Items table 2021-09-02 20:04:51 +05:30
GangaManoj
758a23eff7 fix: Remove Rate from field_no_map 2021-09-02 20:04:25 +05:30
GangaManoj
b5ef69dd34 fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO 2021-09-02 20:04:25 +05:30
GangaManoj
4538071e0d fix: Remove Add Row and Delete Row options for Packed Items table 2021-09-02 20:04:25 +05:30
GangaManoj
361605a2b6 fix: Uncheck read-only for Packed Items table 2021-09-02 20:04:25 +05:30
GangaManoj
c757198d8b fix: Make Rate read-only by default 2021-09-02 20:04:25 +05:30
GangaManoj
39ff46afa8 fix: Test Product Bundle price calculation 2021-09-02 20:04:25 +05:30
GangaManoj
9e399ecc87 fix: Test if Product Bundles are mapped properly on creating a Sales Order 2021-09-02 20:04:24 +05:30
GangaManoj
d0b4aa7504 fix: Map Packed Items to Items table of PO 2021-09-02 20:03:52 +05:30
GangaManoj
890705221e fix: Replace Product Bundles in the Items table with their child items 2021-09-02 20:03:52 +05:30
GangaManoj
3c0883d69b fix: Add Product Bundle field in Items table 2021-09-02 20:03:52 +05:30
GangaManoj
4ca150f4ca fix: Remove Bundle Items table 2021-09-02 20:03:52 +05:30
GangaManoj
18680990bf fix: Display Packed/Bundle Items table only if it exists 2021-09-02 20:03:50 +05:30
GangaManoj
f2c4c1dc0e fix: Enable Print Hide for Bundle Items 2021-09-02 20:03:27 +05:30
GangaManoj
fd8482757e fix: Move Packed Items table right below the Items table 2021-09-02 20:02:36 +05:30
GangaManoj
34546d02be fix: Disable Add Row and Delete Row for Bundle Items 2021-09-02 20:02:36 +05:30
GangaManoj
6bfd5daba0 fix: Create separate section for Bundle Items 2021-09-02 20:02:35 +05:30
GangaManoj
2d9138ab64 feat: Populate Bundle Items table 2021-09-02 20:02:35 +05:30
GangaManoj
f10fdb4eeb feat: Add Bundle Items table 2021-09-02 20:02:35 +05:30
GangaManoj
ba73df161d fix: Make Sales Order field editable so the PO can be linked with an SO later 2021-09-02 20:02:35 +05:30
GangaManoj
bb7ad885da fix: Hide Rate of Bundle Items while printing 2021-09-02 20:02:35 +05:30
GangaManoj
288d0191ab fix: Make Rate column read only by default 2021-09-02 20:02:35 +05:30
GangaManoj
b9a33eca97 fix: Display Bundle Items right below the Items table 2021-09-02 20:02:35 +05:30
GangaManoj
1ecec7154b fix: Enable Fetch If Empty for Rate 2021-09-02 20:02:35 +05:30
GangaManoj
2b56e62805 fix: Calculate Product Bundle price based on the prices of its child items 2021-09-02 20:02:35 +05:30
GangaManoj
084b27bb34 fix: Return if there are no Items 2021-09-02 20:02:35 +05:30
GangaManoj
9039effd69 fix: Get Bundle Items 2021-09-02 20:02:33 +05:30
GangaManoj
3e177ede13 fix: Remove comments 2021-09-02 20:01:06 +05:30
GangaManoj
fd8657d2f7 fix: Get data when grouped by invoice and otherwise 2021-09-02 20:00:49 +05:30
GangaManoj
498377fbbc fix: Display only the Invoice rows in bold 2021-09-02 19:59:44 +05:30
GangaManoj
7ef5952176 fix: Remove base_rate and buying_rate for Invoice rows 2021-09-02 19:58:47 +05:30
GangaManoj
8478a83148 fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled 2021-09-02 19:58:47 +05:30
GangaManoj
fc9557bbb6 fix: Calculate total buying_amount for each invoice 2021-09-02 19:58:47 +05:30
GangaManoj
b14a87eb2b fix: Fetch bundle item details 2021-09-02 19:58:44 +05:30
GangaManoj
e52b0612fc fix: Fetch base_net_total for each Invoice 2021-09-02 19:58:17 +05:30
GangaManoj
ae40c2ad34 fix: Remove qty from Sales Invoice rows 2021-09-02 19:58:15 +05:30
GangaManoj
d730f0e092 fix: Make Rate editable if editable_bundle_item_rates is checked 2021-09-02 19:56:55 +05:30
GangaManoj
39a3ffcb56 fix: Make fieldname more concise 2021-09-02 19:56:53 +05:30