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

2083 Commits

Author SHA1 Message Date
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used 2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:05 +05:30
Rushabh Mehta
39154e5296 fix(minor): add debounce to calls 2020-12-10 12:37:16 +05:30
marination
a5d8d32775 chore: Test and fixes 
- Tests as per new design flow
- Fixed duplicate data bug in Warehouse Capacity Summary
- Set Amount currently on applying rule in client side
- Apply rules on server side before validate
 2020-12-09 16:27:18 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
marination
0f3cfc502b feat: Trigger rule application from client side 
- Table is reset and overwritten with applied rules on checkbox trigger
- Sider fixes
 2020-12-08 19:44:29 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway 2020-12-08 11:44:00 +05:30
marination
fac4035f23 feat: Apply Putaway Rules within transaction itself 
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
 2020-12-07 21:35:49 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return 
feat: Return tracking in PR/DN
 2020-12-06 22:43:34 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Deepesh Garg
7b2d518059 fix: Dimension filters in accounting reports 2020-12-04 11:28:26 +05:30
Saqib Ansari
a6a37b7c81 fix: scroll elements 2020-12-03 19:24:07 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Saqib Ansari
02d1491e39 fix: order summary qty alignment 2020-11-30 17:42:51 +05:30
marination
1087d97c03 feat: Warehouse Capacity Summary 
- Added Page Warehouse Capacity Summary
- Added Page to Desk and Putaway List View
- Reused Item Dashboard/Stock Balance page render code
- Added naming series to Putaway Rule
 2020-11-26 10:45:44 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Saqib Ansari
7f1d7894c2 fix: cannot find erpnext.payments 2020-11-24 16:08:38 +05:30
Saqib Ansari
c1afc95e3c chore: remove unused code 2020-11-23 18:40:06 +05:30
Saqib Ansari
96feae608d refactor: build point of sale min js 2020-11-23 18:39:56 +05:30
Saqib Ansari
937dc467a0 fix: no transactions placeholder 2020-11-23 18:34:08 +05:30
Saqib Ansari
69ef766a93 feat: number pad in payment screen 2020-11-23 18:33:55 +05:30
Saqib Ansari
fa0ef218dd fix: customer details spacing 2020-11-23 18:33:45 +05:30
Saqib Ansari
f719380a0d fix: discount and taxes spacing 2020-11-23 18:33:40 +05:30
Saqib Ansari
fada84cc47 fix: remove console and asset loading 2020-11-23 18:33:34 +05:30
Saqib Ansari
d0d6fc2e17 fix: cannot open past order summary 2020-11-23 18:33:29 +05:30
Saqib Ansari
b0b6aa9124 refactor: past order list and summary with new ui 2020-11-23 18:33:22 +05:30
Saqib Ansari
7202e9f658 refactor: pos payment with new ui 2020-11-23 18:33:05 +05:30
Saqib Ansari
fc3315a6d7 feat: pos item details with new ui 2020-11-23 18:32:58 +05:30
Saqib Ansari
cc208839cf feat: pos cart with new ui 2020-11-23 18:32:49 +05:30
Saqib Ansari
210baafad4 feat: pos customer selector new ui 2020-11-23 18:32:07 +05:30
Saqib Ansari
0fb2e02b56 feat: pos item selector new ui 2020-11-23 18:32:00 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Deepesh Garg
9e9ea96582 fix: linting 2020-11-16 12:03:47 +05:30
Deepesh Garg
f916bc048f fix: Remove cost center query from doctypes 2020-11-15 22:44:39 +05:30
Deepesh Garg
6e5748e2a3 fix: dimension filter query 2020-11-15 22:43:48 +05:30
Deepesh Garg
96e874bfda fix: dimension filter query 2020-11-15 22:43:01 +05:30