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

28329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
65ad4287b6 fix: Customer price list not honored in shopping cart (#18557) 2019-08-05 10:10:38 +05:30
Faris Ansari
b4678d3f21 chore: Remove package-lock.json (#18564) 
Yarn uses yarn.lock
 2019-08-05 10:09:32 +05:30
Suraj Shetty
580fa48642 fix: Quotation list in customer portal (#18579) 
* fix: Quotation list in customer portal

Customers were not able to see their quotations because of
 the recent customer field removal from quotation

* fix: Remove duplicate code
 2019-08-05 10:08:35 +05:30
Mangesh-Khairnar
06a0afa039 Feat: Notify by email feature (#18587) 
* feat: notify user by email in employee onboarding control

* fix: create task on update after submit
 2019-08-05 10:07:05 +05:30
Nabin Hait
a813571c17
Update employee_advance.py 2019-08-05 10:05:28 +05:30
Mangesh-Khairnar
d66396f4e9 fix(employee-advance): update employee advance on change in expense claim (#18588) 
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid

* Update employee_advance.py
 2019-08-05 10:04:05 +05:30
Mangesh-Khairnar
c92e823651 fix(employee-advance): update employee advance on change in expense claim (#18590) 
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid
 2019-08-05 10:02:32 +05:30
Suraj Shetty
35c4b78e66 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-08-04 22:23:03 +05:30
rohitwaghchaure
ed7e074985
Merge pull request #18570 from rohitwaghchaure/add_serial_no_button_not_working 
fix: add serial no button not working for the delivery note
 2019-08-04 12:02:43 +05:30
Deepesh Garg
6f39db6a18
Merge pull request #18576 from deepeshgarg007/taxes_and_totals_v12 
fix: Error handling in taxes and totals
 2019-08-03 18:27:14 +05:30
Deepesh Garg
7668cd7053
Merge pull request #18577 from deepeshgarg007/taxes_and_totals_v13 
fix: Error handling in taxes and totals
 2019-08-03 18:26:54 +05:30
deepeshgarg007
b656529818 fix: Error handling in taxes and totals 2019-08-03 13:49:33 +05:30
deepeshgarg007
8bf19ce81a fix: Error handling in taxes and totals 2019-08-03 13:44:44 +05:30
Deepesh Garg
4d38a5043f
Merge pull request #18573 from deepeshgarg007/error_report_develop 
fix: Remove payment order from bank dashboard
 2019-08-03 12:17:13 +05:30
Deepesh Garg
2f1633bf41
Merge pull request #18574 from deepeshgarg007/error_report_v12 
fix: Remove payment order from bank dashboard
 2019-08-03 12:16:52 +05:30
deepeshgarg007
a499079250 fix: Remove non standard fieldname 2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12 2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc fix: Remove payment order from bank dashboard 2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8 fix: Remove payment order from bank dashboard 2019-08-03 10:17:44 +05:30
Suraj Shetty
4b3b358ac6 fix: Show correct label instead of showing undefined (#18559) 2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913 fix: Show correct label instead of showing undefined (#18560) 2019-08-02 21:46:28 +05:30
Rohit Waghchaure
dadd049cbf fix: add serial no button not working for the delivery note 2019-08-02 19:11:31 +05:30
Suraj Shetty
6fd3a86012 fix: Option to create pick list from work order 2019-08-02 16:48:31 +05:30
Sahil Khan
8426ff726a Merge branch 'version-12-hotfix' into version-12 2019-08-02 14:27:59 +05:30
Sahil Khan
968da1cd21 bumped to version 12.0.4 2019-08-02 14:47:59 +05:50
sahil28297
7d7e4534dd
Merge pull request #18566 from scmmishra/task-fix 
fix: task not updated issue
 2019-08-02 14:15:19 +05:30
sahil28297
c7abc025ff
Merge branch 'develop' into task-fix 2019-08-02 14:14:52 +05:30
sahil28297
77313685da
Merge pull request #18567 from scmmishra/task-fix-patch1 
fix: task not updated issue
 2019-08-02 14:14:27 +05:30
Shivam Mishra
0313dc0f8c fix: task not updated issue 2019-08-02 14:12:36 +05:30
Shivam Mishra
dc53e8ebb0 fix: task not updated issue 2019-08-02 13:56:49 +05:30
Suraj Shetty
117161401a
fix: Check zero valuation rate only for valid doctypes (#18528) 
fix: Check zero valuation rate only for valid doctypes
 2019-08-02 11:22:47 +05:30
Suraj Shetty
c6857e562b
fix: Check zero valuation rate only for valid doctypes (#18529) 
fix: Check zero valuation rate only for valid doctypes
 2019-08-02 11:22:31 +05:30
Suraj Shetty
3f31a56fb3
feat(customer): Add report to show item prices per Customer (#17930) 
feat(customer): Add report to show item prices per Customer
 2019-08-02 11:11:51 +05:30
Suraj Shetty
c154e57603
Merge branch 'develop' into stock-ledger-fix_develop 2019-08-02 08:44:21 +05:30
Suraj Shetty
b559bf6de6
Merge branch 'version-12-hotfix' into stock-ledger-fix 2019-08-02 08:43:54 +05:30
Suraj Shetty
c57328669a feat: Add pick list print format 2019-08-02 08:14:27 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report 2019-08-01 17:51:03 +05:30
Suraj Shetty
a7dc3735ae fix: Move folders to right location 2019-08-01 15:49:29 +05:30
Deepesh Garg
4be00502cc
Merge pull request #18546 from deepeshgarg007/bank_dashboard_fix 
fix: Payment Order link fix in bank dashboard
 2019-08-01 15:24:53 +05:30
Deepesh Garg
097cc13072
Merge pull request #18547 from deepeshgarg007/bank_dashboard_v12 
fix: Payment Order link fix in bank dashboard
 2019-08-01 15:24:37 +05:30
deepeshgarg007
c16ef32b6b fix: Payment Order link fix in bank dashboard 2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39 fix: Payment Order link fix in bank dashboard 2019-08-01 13:24:48 +05:30
Suraj Shetty
31e3dada0e
Merge branch 'version-12-hotfix' into bom-comparison-tool 2019-08-01 12:59:19 +05:30
Suraj Shetty
e06f486aee fix: Rename methods 2019-08-01 12:54:33 +05:30
Faris Ansari
d9e482759c
style: Missing semicolon 2019-08-01 12:53:19 +05:30
Suraj Shetty
bb7a2dbb6a fix: Rename file 2019-08-01 12:38:26 +05:30
Suraj Shetty
0c1dbb116f Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-01 12:06:20 +05:30
Suraj Shetty
fbcc56536b fix: Rename Pick TIcket -> Pick List 2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2 fix: Add and rename some fields 
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
 2019-08-01 11:07:14 +05:30