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

32924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rushabh Mehta
ee921052c0 fix(minor): test dependencies 2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d fix(minor): import 2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf fix(minor): circular imports? 2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f fix(hot): Pricing Rule encoding fixed 2020-08-25 11:59:57 +05:30
Anupam K
28f4417fc5 fix: added filter show in website for filtering product 2020-08-25 08:59:37 +05:30
Deepesh Garg
f6b4eb27ab
Merge pull request #23034 from gwhitney/dims_in_gl_report 
fix(General Ledger): include Accounting Dimension columns in report
 2020-08-24 22:11:50 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report 2020-08-24 20:23:19 +05:30
Marica
de5b2be345
Merge pull request #22844 from anupamvs/crm-reports 
refactor: Crm reports cleanup
 2020-08-24 20:15:42 +05:30
Marica
3e966d6889
Merge branch 'develop' into crm-reports 2020-08-24 19:42:18 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants (#22911) 
* feat: validate if removed item attributes exist in variants

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: smaller loop

Co-authored-by: marination <maricadsouza221197@gmail.com>

* feat: don't run validation for new entries

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: use tuple as is

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: error description

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: remove unused variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-24 19:37:09 +05:30
marination
8f452b8663 fix: Codacy and indicator message 2020-08-24 18:57:07 +05:30
marination
f49665077c feat: Quoted Item Comparison Report Enhancements v2 2020-08-24 18:26:48 +05:30
Anupam K
64e84643fb lost opportunity 2020-08-24 18:01:28 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle 
fix: GLE for subcontracted PR is fg item rate is zero
 2020-08-24 16:07:32 +05:30
Shivam Mishra
5d6b07558d
Merge branch 'develop' into iff-invoicing 2020-08-24 07:56:01 +00:00
rohitwaghchaure
554e2c2eb7
Merge pull request #23120 from deepeshgarg007/sle_cancel 
fix: Reverse SLE not created for fraction qty or qty less than 1
 2020-08-24 13:25:12 +05:30
rohitwaghchaure
7d8d26bbea
Merge pull request #23106 from ruchamahabal/add-pos-page 
fix: POS page link not visible on Desk
 2020-08-24 12:22:18 +05:30
Mangesh-Khairnar
e292fd6c58 feat: add integrations desk page 2020-08-24 00:45:13 +05:30
Deepesh Garg
8331a38ace fix: Test Case for qty less than 1 2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-23 20:43:50 +05:30
Nabin Hait
337ee0a4bf test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 19:17:18 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Deepesh Garg
1b760cb278 Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-21 12:36:21 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 
fix: check setup complete flag instead setup page
 2020-08-21 11:55:38 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies (#23109) 2020-08-20 19:39:10 +05:30
Deepesh Garg
cf3e482052
Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 
fix: Unable to submit reverse charge invoice
 2020-08-20 19:35:25 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email (#23097) 
* fix: Create Opoortunity without Default Company from Email

* fix: Add Prompt to Select Company

* Update communication.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 19:12:12 +05:30
Rucha Mahabal
4061186429 fix: POS page link not visible on Desk 2020-08-20 18:01:20 +05:30
Deepesh Garg
afd2dd3570 fix: Unable to submit reverse charge invoice 2020-08-20 16:52:52 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case (#23102) 2020-08-20 15:53:58 +05:30
Raffael Meyer
f0b9f660cd
Merge branch 'develop' into datev_refactor 2020-08-20 12:05:50 +02:00
Shivam Mishra
ae9208dc87
Merge pull request #22995 from scmmishra/fix-margin-for-filter 2020-08-20 09:28:15 +00:00
Shivam Mishra
25ba271562
Merge branch 'develop' into fix-margin-for-filter 2020-08-20 08:59:04 +00:00
Shivam Mishra
d5971d3c59
Merge branch 'develop' into iff-invoicing 2020-08-20 08:16:22 +00:00
rohitwaghchaure
5f2463933a
Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty 
feat(queries): sort warehouses based on item quantity in descending manner
 2020-08-20 09:36:16 +05:30
Raffael Meyer
585f1f67b7
Merge branch 'develop' into navbar_links 2020-08-19 18:55:44 +02:00
Raffael Meyer
2c26144a6b
Update erpnext/patches/v13_0/add_standard_navbar_items.py 2020-08-19 18:55:06 +02:00
Deepesh Garg
cbedb3de3a
Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 
fix: Do not update total for RCM invoices if net taxes are zero
 2020-08-19 20:19:06 +05:30
Rucha Mahabal
3fb40aa0b2
Merge pull request #23075 from ruchamahabal/fix-pos-print 
fix: Print Language for Customer not set for POS Invoice
 2020-08-19 19:02:02 +05:30
Deepesh Garg
8aed48fe31 fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-19 18:59:27 +05:30
Rucha Mahabal
eed2a6340c
Merge branch 'develop' into fix-pos-print 2020-08-19 18:57:47 +05:30
marination
22d3729427 fix: Codacy 2020-08-19 15:42:40 +05:30
Deepesh Garg
aaeb3980bc feat: JSON download for HSN wise outward summary 2020-08-19 15:13:30 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Diksha Jadhav
182ee5e7c1 feat(queries): sort warehouses based on item quantity 2020-08-19 14:04:34 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 
fix: Tax amounts in HSN Wise Outward summary
 2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401 fix: Remove print statements 2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907 fix: Tax amounts in HSN Wise Outward summary 2020-08-19 11:41:33 +05:30
Rucha Mahabal
434bab8003 fix: Print Language for Customer not set for Print Receipt in POS 2020-08-19 01:00:59 +05:30