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

23666 Commits

Author SHA1 Message Date
Saqib
f2ea3877c8
fix: depreciation start date ux fixes (#23339) 2020-09-20 19:31:18 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set (#23334) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 19:33:21 +05:30
Deepesh Garg
6bcfffda1d
Merge branch 'develop' into barredterra-patch-1 2020-09-19 18:33:14 +05:30
Deepesh Garg
c646a56d68
fix: Update modified timestamp 2020-09-19 18:28:20 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter 
fix: warehouse address filtered based on warehouse
 2020-09-19 18:17:08 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error 
fix: set_taxes() missing 1 required positional argument: 'company'
 2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 18:05:58 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Michelle Alva
cc6ca97dc5
fix: Item-wise Sales History Report Error (#23349) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-18 15:50:29 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields (#23358) 2020-09-18 15:27:17 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Afshan
d5710b4d6f style: removed extra spaces 2020-09-17 13:01:47 +05:30
Afshan
e813684433 fix: warehouse address filtered based on warehouse 2020-09-17 12:57:26 +05:30
Deepesh Garg
2aea184f6f
Merge pull request #23309 from anupamvs/sales-analytics 
feat: added project in Sales Analytics report
 2020-09-17 12:37:14 +05:30
Rucha Mahabal
c78ca36ee5 fix(Non Profit): Hide Address and Contact section for unsaved docs 2020-09-16 23:47:33 +05:30
Anupam Kumar
11649efc41
Merge branch 'develop' into sales-analytics 2020-09-16 21:45:57 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark 
feat: added option to add custom remarks in payment entry
 2020-09-16 13:38:04 +05:30
Deepesh Garg
15f698251b
Merge pull request #23079 from marination/item-tax-update-items 
fix: Item Tax Updating via `Update Items` in SO/PO
 2020-09-15 20:47:20 +05:30
Deepesh Garg
db52cfe05a
Merge pull request #22849 from alyf-de/datev_refactor 
refactor: move datev-specific stuff to utils
 2020-09-15 19:50:00 +05:30
Marica
f63b6719e3
Merge branch 'develop' into item-tax-update-items 2020-09-15 17:45:05 +05:30
marination
f995f517c9 fix: Test 2020-09-15 17:06:27 +05:30
Deepesh Garg
2f50cb3e58 fix: Supplier trigger onload 2020-09-15 15:00:32 +05:30
Rohit Waghchaure
4f3b7da9ba fix: set_taxes() missing 1 required positional argument: 'company' 2020-09-15 14:47:36 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics 2020-09-15 13:24:02 +05:30
Anurag Mishra
9397b7f58b fix: requested changes 2020-09-15 12:36:01 +05:30
Anupam
bae2d5d485 fix: review changes 2020-09-15 12:12:31 +05:30
marination
665c27af58 fix: Merge conflict missing line 2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
marination
4bb8d0c193 chore: Test for PO 2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869) 
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice (#23027) 2020-09-15 09:44:46 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics 2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051) 2020-09-14 21:12:36 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items (#23024) 
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-14 19:54:17 +05:30
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id 
fix: Set student email id mandatory only if skip user creation is disabled
 2020-09-14 19:34:10 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module 2020-09-14 14:45:19 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items 2020-09-14 11:09:32 +05:30
marination
9205101ecf fix: Make Reference fields mandatory in Quality Inspection 2020-09-12 16:17:13 +05:30
marination
0a688005be fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-12 15:39:27 +05:30
barredterra
16f1435d63 fix: codacy 2020-09-11 18:57:58 +02:00
barredterra
41978ac882 Merge branch 'develop' into datev_refactor 2020-09-11 17:54:50 +02:00
Anupam K
ed08e593c3 feat: added project in Sales Analytics report 2020-09-11 14:03:31 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297) 
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
 2020-09-10 19:28:46 +05:30
Rucha Mahabal
a29436dc91 fix: codacy 2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a test: Lab Module 2020-09-10 17:33:52 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module 2020-09-10 12:36:29 +05:30
Rucha Mahabal
2388199347
Merge branch 'develop' into fix-student-email-id 2020-09-10 12:16:16 +05:30
Rucha Mahabal
1915a60834 fix: education settings check 2020-09-10 12:13:58 +05:30