Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,578 Commits 3 Branches 0 Tags 1 GiB
32371c8755
Commit Graph

1498 Commits

Author SHA1 Message Date
Suraj Shetty
bc2ff785f1 fix: Restore "allow delivery" condition checks (#18246) 
* fix: Remove `allow_delivery` flag

- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated

* fix: Restore allow_delivery condition checks
 2019-07-11 10:43:40 +05:30
Mangesh-Khairnar
d749f20f63 fix: installation note (#18232) 2019-07-10 19:29:39 +05:30
Himanshu
e7bb54ed76 feat(Issue): Settings to stop SLA tracking (#18112) 
* fix: fix msgprint when creating new issues

* fix: use getdate

* fix: do not self save

* fix: test case

* fix: error due to comparing date and str

* fix: creation time for replicated issue

* feat: sla in support settings

* fix: remove sla settings

* feat: enable check in sla

* fix: throw if sla is disabled

* fix: enable sla
 2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347
fix: Make material request against SO only for pending qty (#18216) 2019-07-10 17:05:49 +05:30
Rushabh Mehta
8309fcfbbc BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059) 
* BREAKING CHANGE: Remove anti-pattern "Project Task"

* fix(tests): remove `tasks` from project/test_records.json

* fix(tests)

* fix(test): test_employee_onboarding.py

* fix(tests): test_expense_claim.py

* fix(refactor): cleanup project.py validate/update

* fix(refactor): cleanup project.py validate/update

* fix(test): test_expense_claim

* fix(test): test_expense_claim

* fix(test): test_expense_claim, try Test Company 4

* Update project.py
 2019-07-08 10:39:30 +05:30
Anurag Mishra
bdec7fea82 feat: purchase order against sales order (#17975) 
* feat: purchase order against sales order

* fix: remove unwanted checks

* fix:Related tests
 2019-07-04 12:28:01 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Deepesh Garg
ea0574679f fix: Removed submitted status from Quotation (#18055) 
* fix: Change in list view and status updater

* fix: Change status in doctype

* fix: Patch for submitted status
 2019-06-26 11:05:51 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 (#18067) 2019-06-26 10:57:45 +05:30
Rohit Waghchaure
1777e60dc2 fix: test case for payment terms in quotation 2019-06-24 14:11:06 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO 
fix: copy_payment_schedule_from_quot_to_SO
 2019-06-21 09:19:20 +05:30
Deepesh Garg
23deb6f79b fix: Default cost center fix for delivery note item (#17990) 2019-06-20 19:11:58 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO 2019-05-27 14:00:43 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev 
feat: Added 'Add Multiple' options in all sales / purchase transactions
 2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce feat: Added 'Add Multiple' options in all sales / purchase transactions 2019-05-16 14:54:05 +05:30
Deepesh Garg
0ae1c293d3 fix: Status updater fixes in PO and SO and test coverage for return (#17491) 
* fix: Status updator fixes in sales and purchase cycle

* fix: Test cases for return in so and po

* fix: Resolve conflicts
 2019-05-15 12:23:24 +05:30
Himanshu Warekar
24442af9ae fix: use list comprehension 2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5 fix: calculate percentage only if sales team exist 2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347 fix: sales percentage equal to 100 2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c fix: python side validation 2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f fix: validate percentage total 2019-05-04 22:35:52 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign 
feat: Additional fields in campaign
 2019-05-02 03:18:22 +05:30
Nabin Hait
c0fdb80486
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO 2019-05-02 01:00:12 +05:30
Nabin Hait
d539def25d
Update campaign.json 2019-05-02 00:44:29 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables 
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
 2019-05-01 19:31:00 +05:30
Rushabh Mehta
c3aecb1fbd fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table 2019-05-01 18:04:22 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title (#17403) 
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
 2019-04-29 22:41:48 +05:30
Basawaraj Savalagi
d4585efc6a feat: Additional fields in campaign 2019-04-29 22:12:50 +05:30
ashish-greycube
4707ad2029 fix: copy_payment_schedule_from_quot_to_SO 2019-04-26 12:14:40 +05:30
deepeshgarg007
4a4ce12eb4 fix: Commonfied code for inter-company-transaction 2019-04-25 14:28:19 +05:30
deepeshgarg007
555f425da1 fix: Test case and styling fixes 2019-04-22 20:24:31 +05:30
deepeshgarg007
c841bd486a feat: Added validations and mapper to create inter company mapper 2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af feat: Added custom button to make inter company order 2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd feat: Updated doctypes for sales and purchase order 2019-04-18 20:08:20 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements 
feat: Production plan enhancements
 2019-04-17 17:31:14 +05:30
Rohit Waghchaure
38238b0cfd fixed test cases 2019-04-17 15:56:00 +05:30
Rushabh Mehta
4f49ce4124 feat: auto assign lead/opportunity to lead owner, customer account manager 2019-04-12 09:04:17 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Mangesh-Khairnar
63cf56f406 style: change function call to anonymous function call 2019-04-09 17:47:25 +05:30
Mangesh-Khairnar
b70b048fa2 style: change type comparison for boolean expression 2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-04-09 12:13:45 +05:30
Rohit Waghchaure
9835c89e17 Added test cases 2019-04-06 12:29:05 +05:30
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48 feat: provision to make Maintenance Schedule from sales invoice 2019-03-26 12:52:32 +05:30
Mangesh-Khairnar
324e06cba0 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-03-25 18:51:13 +05:30
Mangesh-Khairnar
b3ec508655 feat: record reason for hold as comment 2019-03-25 17:29:14 +05:30