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

1112 Commits

Author SHA1 Message Date
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
Mangesh-Khairnar
f8c92f30bf feat(purchase-order): Add tax category field in purchase order 2019-07-11 18:27:49 +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
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 (#18067) 2019-06-26 10:57:45 +05:30
rohitwaghchaure
8aff023abe
Merge pull request #18049 from deepeshgarg007/rounded_total_develop 
fix: Currency symbol fix for rounded total
 2019-06-25 15:14:34 +05:30
deepeshgarg007
ab13192dd4 fix: Currency symbol fix for rounded total 2019-06-24 21:22:52 +05:30
sahil28297
9a6517f8f0
fix(BOM): update modified field 2019-06-23 20:06:18 +05:30
Sahil Khan
aef77058b6 fix(BOM): set default value of include_exploded_item to 0 2019-06-21 11:37:45 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
2580075583 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-30 22:11:27 +05:30
Nabin Hait
0e1e37c921 fix: Added Expense Account field to push value from PO-PR-PI 2019-05-30 18:13:41 +05:30
Faris Ansari
dd016479af
fix: Remove print statement 2019-05-28 18:27:22 +05:30
Anurag Mishra
5afe9f2200 fix: changed dialog field to select 2019-05-28 18:23:34 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
Nabin Hait
bfb09d51a3 fix: test cases 2019-05-22 12:15:56 +05:30
Nabin Hait
d752051b8d fix: update received qty in PO from PR 2019-05-22 11:59:19 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report (#17524) 
feat(regional): Bank remittance report
 2019-05-20 15:00:48 +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
Mangesh-Khairnar
557419a745 feat: load company bank account 2019-05-14 18:30:19 +05:30
deepeshgarg007
e13a56cc80 Merge branch develop into notification 2019-05-08 10:16:30 +05:30
Himanshu
5cf12a4640 fix(Purchase Order): fetch payment terms (#17121) 
* fix: fetch payment terms

* fix: test fixes

* fix: test cases

* fix: test case

* fix: check for payment terms fetching

* fix: test cases

* refactor: fetch payment terms in account settings

* fix: add fetch terms to account settings
 2019-05-04 22:37:35 +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
deepeshgarg007
c23b70950e Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-26 16:43:06 +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
06c20400ee feat: Track purchase receipt status in Material Request 2019-04-22 12:25:14 +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
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold 
Feature: Purchase order on hold
 2019-04-11 15:36:54 +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
a2facd4dd2 style: change function call to anonymous function 2019-04-09 12:07:44 +05:30
Rohit Waghchaure
9835c89e17 Added test cases 2019-04-06 12:29:05 +05:30
Mangesh-Khairnar
3c251663bb style: add type comparison for boolean expression 2019-04-05 14:10:05 +05:30
Mangesh-Khairnar
3d667b4c94 Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold 2019-04-05 12:11:26 +05:30
Mangesh-Khairnar
b2dc6ef165 style: fix the message for reason for hold 2019-04-02 18:01:14 +05:30
Rohit Waghchaure
e540534e42 fix: Pricing rule not working for POS 2019-03-31 17:13:18 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
f288866130 fix: Cost center from PO to PI is not mapping 2019-03-20 13:34:28 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Mangesh-Khairnar
db96db2897 style: change position of hold and resume button 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
e613c4f380 test: purchase order on hold 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
873c579bb4 fix: check for both hold and closed status in po 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
4f74313baf feat: record reason for hold as comment 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723 feat: add validation for on hold purchase order 2019-03-18 12:14:25 +05:30