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

2051 Commits

Author SHA1 Message Date
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +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
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report 2019-08-01 17:51:03 +05:30
Rohit Waghchaure
40e35048b8 fix: can't compare datetime.date to unicode 2019-07-29 17:14:39 +05:30
Rucha Mahabal
d23a95c06e fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign 2019-07-22 12:26:52 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign 2019-07-19 15:07:56 +05:30
Rohit Waghchaure
9fe6e00a4e fix: not able to make material request for bundle items from the sales order 2019-07-19 07:54:08 +05:30
Suraj Shetty
06b56adc71
Merge branch 'develop' into develop-customer-item-price-report 2019-07-17 17:29:42 +05:30
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
deepeshgarg007
8cbc22062b fix: Remove cost center filter from customer credit balance report 2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91 fix: Remove cost center filter from customer credit balance report 2019-07-15 18:32:10 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
Rucha Mahabal
bbb22ad082 fix: child table naming 2019-07-15 17:52:50 +05:30
sahil28297
7697066cc2 fix(sales_order_list): compare type as well (#18331) 
* fix(sales_order_list): compare type as well

* fix(sales_order_list): compare type as well
 2019-07-15 11:25:06 +00:00
deepeshgarg007
f7395916c8 fix: Accounting Dimensions in Customer Credit Balance report 2019-07-14 18:44:32 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
Deepesh Garg
f9e4391998
Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop 
feat: "Order Type" tree type for Sales Analytics report (develop)
 2019-07-12 14:28:16 +05:30
Rucha Mahabal
9e35bff55c feat: Email Campaign 2019-07-12 13:56:36 +05:30
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
Don-Leopardo
93fbba4f40
Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-07-10 10:52:55 -03:00
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
rohitwaghchaure
6b2075a115
Merge pull request #18161 from deepeshgarg007/additional_discount 
fix: Additonal discount not getting set in sales transactions
 2019-07-05 18:13:23 +05:30
karthikeyan5
7fc6021ca5 feat(setup): adding selling buying filter in terms and conditions 2019-07-04 22:46:16 +05:30
deepeshgarg007
a9ea49c976 fix: Additonal discount not get set in sales transactions 2019-07-04 15:56:34 +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
fb29ffc90c fix: Usability fixes to Serial No and batch selector (#18071) 
* fix: Usability fixes to Serial No and batch selector

* fix: Codacy

* Update sales_common.js
 2019-06-28 14:08:08 +05:30
Don-Leopardo
a01d0a5311
Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-06-27 18:09:09 -03:00
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
Aditya Hase
2caaa1b03d fix(sales-funnel): Remove duplicate code 2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc fix(sales-funnel): Use frappe.Chart() instead of Chart() 2019-06-25 17:07:41 +05:30
Don-Leopardo
54b9fd5bef
Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-06-24 11:29:23 -03:00
NahuelOperto
42fe68d065 feat: order type in trr type filter 2019-06-24 08:29:14 -03:00
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
Rohit Waghchaure
7efeffa66a fix: allow edit is enabled in the pos profile still user not able to edit the rates 2019-06-17 16:20:32 +05:30
Rohan Bansal
0426636a32 fix(customer): Improve performance by reducing queries 2019-06-17 12:16:12 +05:30
Rohan Bansal
e3a3306b30 feat(customer): Add report to show item prices per Customer 2019-06-13 14:53:33 +05:30
Rohan Bansal
250734dd24 fix(selling): Remove Totals row for tree-based Sales Analytics 2019-05-30 17:30:50 +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