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

2646 Commits

Author SHA1 Message Date
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:25 +05:30
Tunde Akinyanmi
f2b12a3b9c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-09 07:20:19 +01:00
michellealva
38aee6e3cb fix(Selling): Add missing reports on desk 2020-10-08 10:24:11 +05:30
Tunde Akinyanmi
4010196488 fix: pass self.flags.ignore_permissions to the ignore_permissions 
argument of Address and Contact controller
 2020-10-08 02:25:09 +01:00
Kenneth Sequeira
be0ebc5085 spell fixes for Condition 2020-10-07 20:47:12 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
marination
e7af9ff999 fix: Show Project under Create button in SO 2020-10-05 12:24:43 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Deepesh Garg
287014a9a2 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:10 +05:30
Deepesh Garg
fc71e5b5b7 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:00 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Mangesh-Khairnar
4eb215badb fix: bind callback callback for realtime event 2020-09-23 15:55:21 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +05:30
Saqib
7126e179c3 fix: button click event not working in POS custom fields (#23358) 2020-09-22 16:35:11 +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
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics 2020-09-15 13:24:02 +05:30
Anupam
bae2d5d485 fix: review changes 2020-09-15 12:12:31 +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
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics 2020-09-14 11:21:58 -07:00
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
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
Anupam Kumar
924618e1e3
Merge branch 'develop' into opportunity-status 2020-09-06 21:24:32 +05:30
Anupam Kumar
c3984691b3
fix: Sales funnel data is inconsistent (#23110) 
* fix: Sales funnel data is inconsistent

* fix: data inconsistency

* fix: Converted Count

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-02 20:01:14 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email 2020-09-01 16:18:12 +05:30
rohitwaghchaure
a3dd156a8a
Merge pull request #22796 from anupamvs/variance-report-fix 
fix: Target variance report signs
 2020-09-01 15:12:21 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Shivam Mishra
1c96befbaf
Merge branch 'develop' into feat-exotel-customer-link 2020-08-31 11:47:06 +05:30
Marica
d2d350ce14
Merge branch 'develop' into credit-limit-email 2020-08-31 11:45:15 +05:30
marination
e268d294b3 fix: Better error feedback on creating SO from Quotation 2020-08-30 21:01:34 +05:30
bhavesh95863
3e9f493f15
fix: change parseFloat to flt 2020-08-28 11:15:02 +05:30
bhavesh95863
33f984c7af
fix: can't multiply sequence by non-int of type 'float 2020-08-27 21:49:21 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Rucha Mahabal
1bd83e69ee
feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183) 2020-08-27 13:06:52 +05:30
Rucha Mahabal
12f7aeb147 feat: add Maintenance Visit link in Sales Order dashboard 2020-08-25 19:03:35 +05:30
Rucha Mahabal
5bf0a51ed4 feat: add Maintenance Visit link in Customer dashboard 2020-08-25 18:22:06 +05:30
Shivam Mishra
de4ac0c905 chore: remove stray tabs 2020-08-25 17:10:05 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Rucha Mahabal
4061186429 fix: POS page link not visible on Desk 2020-08-20 18:01:20 +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
Marica
12c68d0450
Merge branch 'develop' into credit-limit-email 2020-08-18 13:39:03 +05:30
marination
205df14a48 fix: Credit Limit Email not working 2020-08-17 16:23:44 +05:30
michellealva
e69b2e0da1 fix: Remove dependency of Sales Order in Sales Analytics 2020-08-15 10:16:26 +05:30