nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,480 Commits 399 Branches 1,700 Tags
454630f2bd7ce51da2c92adfd2239a8a2e597efb
Commit Graph

37480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
454630f2bd fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) (#27378) 
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities


Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit 058d98342a)
 2021-09-07 13:00:18 +05:30
Saqib
40fa4cf77c fix: 'NoneType' has no attribute 'name' (#27375) 2021-09-07 12:13:22 +05:30
Ganga Manoj
e8eb137cd4 fix: update Selling Settings (#27364) 2021-09-07 11:42:26 +05:30
Frappe PR Bot
821d55b0e0 fix: employee remider settings (#27365) (#27366) 
(cherry picked from commit 88c9fe35bd)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-09-07 00:20:38 +05:30
Frappe PR Bot
1708e8b7ce fix: patch failure for vat audit report (#27355) (#27357) 
(cherry picked from commit 14b01619de)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-06 13:51:18 +05:30
Frappe PR Bot
61e71d45fa fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326) (#27354) 
(cherry picked from commit 0f2a52078c)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-06 13:34:50 +05:30
Chillar Anand
05e06e8455 fix(healthcare): Added item price to default price list (#27353) 
Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2021-09-06 13:27:28 +05:30
Deepesh Garg
6bab2b0f86 Merge pull request #27344 from frappe-pr-bot/backport/version-13-hotfix/27316 
fix: Presentation currency conversion in reports
 2021-09-06 10:28:23 +05:30
Deepesh Garg
1ff2562f98 fix: Presentation currency conversion in reports (#27316) 
(cherry picked from commit ceaa804f04)
 2021-09-05 11:52:39 +00:00
Frappe PR Bot
e9da4ed34d fix: manually added weight per unit reset to zero after save (#27330) (#27338) 
(cherry picked from commit 7b4a65484a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-03 22:54:49 +05:30
Marica
aee2e04a45 Merge pull request #27332 from marination/paging-discount-fix 
fix: Paging and Discount filter
 2021-09-03 19:11:58 +05:30
Ankush Menat
d3330cec87 chore: ignore import cleanup commit in blame 2021-09-03 19:00:47 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
marination
477870eb78 test: Product Discounts 2021-09-03 18:51:56 +05:30
marination
a32bb25407 fix: Linter (whitespace) 2021-09-03 18:04:53 +05:30
marination
99ec4cc7fe fix: Paging and Discount filter 
- Convert incoming api args to frappe dict
- Change discount filter condition due to reversal of behaviour
 2021-09-03 17:50:14 +05:30
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