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 |
|
Anurag Mishra
|
1a98cce3a4
|
Merge branch 'develop' into subs
|
2019-05-15 16:40:03 +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 |
|
Deepesh Garg
|
35226b1f32
|
Merge pull request #17415 from deepeshgarg007/notification
feat: Track purchase receipt status in material request
|
2019-05-09 00:03:34 +05:30 |
|
Saurabh
|
27e7ae6773
|
Merge branch 'develop' into procurement-tracker
|
2019-05-08 11:30:38 +05:30 |
|
deepeshgarg007
|
e13a56cc80
|
Merge branch develop into notification
|
2019-05-08 10:16:30 +05:30 |
|
Anurag Mishra
|
c3dcf02784
|
test: subcontracted raw materials to be recieved
|
2019-05-07 17:43:48 +05:30 |
|
Anurag Mishra
|
58bd2df834
|
fix: code refactor
|
2019-05-07 17:42:22 +05:30 |
|
Anurag Mishra
|
9acb2bf28f
|
test: for subcontracting item be received
|
2019-05-07 14:38:30 +05:30 |
|
Mangesh-Khairnar
|
09d4933edb
|
fix: filter pi item based on po completeion
|
2019-05-06 12:53:52 +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 |
|
Mangesh-Khairnar
|
e003cc8812
|
fix: filter out completed purchase receipt
|
2019-05-03 16:41:04 +05:30 |
|
Mangesh-Khairnar
|
13d393247a
|
feat: add date range filters
|
2019-05-03 16:00:02 +05:30 |
|
Anurag Mishra
|
d0cdb4a1e9
|
feat: subcontracting report
|
2019-05-03 14:05:29 +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 |
|
Mangesh-Khairnar
|
cc8e2b6aca
|
test: pass filters to execute
|
2019-05-01 10:03:57 +05:30 |
|
Mangesh-Khairnar
|
96661ba847
|
feat: add filters for multiple company operation
|
2019-04-28 17:11:28 +05:30 |
|
deepeshgarg007
|
c23b70950e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
|
2019-04-26 16:43:06 +05:30 |
|
Mangesh-Khairnar
|
9cd9671bb5
|
fix: minor changes
|
2019-04-26 16:02:25 +05:30 |
|
Mangesh-Khairnar
|
da7b1673c3
|
test: track pi and pr changes
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
869544c0bc
|
fix: add mapped records as functions
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
438fa620b0
|
feat: fetch purchase invoice and purchase receipt records for actual cost calculation
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
fcd0edf415
|
test: compare expected data to generated data
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
46b9204e9d
|
feat: fetch data from budget records for cost estimation
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
5de08f71c5
|
feat: fetch all required fields from po
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
69909c0f51
|
feat: create procurement tracker report
|
2019-04-26 01:31:16 +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
|
d249325d98
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-22 18:00:13 +05:30 |
|
deepeshgarg007
|
06c20400ee
|
feat: Track purchase receipt status in Material Request
|
2019-04-22 12:25:14 +05:30 |
|
Rohit Waghchaure
|
72cc7508b0
|
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered
|
2019-04-19 14:57:38 +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 |
|
Mangesh-Khairnar
|
439546c83c
|
feat: add on hold status in purchase order
|
2019-03-18 12:14:25 +05:30 |
|
Rohan Bansal
|
82433845e5
|
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
|
2019-03-14 13:18:55 +05:30 |
|
Sagar Vora
|
cc6e51c62d
|
Merge branch 'master' into develop
|
2019-02-19 18:09:49 +05:30 |
|
deepeshgarg007
|
de0f59b818
|
fix: Removed precision from multiple doctypes
|
2019-02-19 08:40:16 +05:30 |
|
Frappe Bot
|
74fd5daeb2
|
Merge branch 'master' into develop
|
2019-02-15 10:22:33 +00:00 |
|
deepeshgarg007
|
867ca63750
|
fix: Purchase order item description fix
|
2019-02-14 18:10:47 +05:30 |
|
Deepesh Garg
|
4d1bc0ca85
|
fix: Add total row in analytics report (#16648)
|
2019-02-13 16:58:46 +05:30 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Sagar Vora
|
f3cfad7595
|
Merge branch 'master' into staging-fixes
|
2019-01-29 17:20:46 +05:30 |
|
Nabin Hait
|
e8190473f5
|
Merge branch 'staging-fixes' into unicode
|
2019-01-29 11:13:04 +05:30 |
|
Saif Ur Rehman
|
3d275af67b
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
|
2019-01-24 23:40:16 +05:00 |
|
Sagar Vora
|
e9778d9556
|
fix: do not use built-in "input", reload_doc
|
2019-01-23 17:13:31 +05:30 |
|
Sagar Vora
|
f51661b225
|
fix: allow operators, make weighting_function mandatory
|
2019-01-23 16:42:28 +05:30 |
|
Sagar Vora
|
9aeabce3d3
|
fix: trailing whitespace, duplication & more
|
2019-01-23 16:01:19 +05:30 |
|
Sagar Vora
|
57d7c837aa
|
fix: supplier scorecard test
|
2019-01-23 14:26:35 +05:30 |
|
Sagar Vora
|
037d0f8ba6
|
fix(buying): make supplier scorecard usable
|
2019-01-23 14:11:25 +05:30 |
|
Frappe Bot
|
e415cce1a9
|
Merge branch 'staging' into develop
|
2019-01-23 08:19:00 +00:00 |
|
Aditya Hase
|
f3c22f342c
|
fix(unicode): Import unicode_literals in every file
|
2019-01-22 18:36:10 +05:30 |
|
Saif Ur Rehman
|
74a3370095
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
|
2019-01-22 16:20:40 +05:00 |
|
Rohit Waghchaure
|
fa7ee0b3b6
|
Added dafult bank account in the customer/supplier
|
2019-01-17 15:45:27 +05:30 |
|
Deepesh Garg
|
59b9d363c9
|
Delete purchase_order.json
|
2019-01-16 22:54:45 +05:30 |
|
Deepesh Garg
|
e6e1f2a46f
|
Delete __init__.py
|
2019-01-16 22:53:28 +05:30 |
|
Deepesh Garg
|
9fb871c040
|
Delete pending_purchase_order.json
|
2019-01-16 22:52:27 +05:30 |
|
Deepesh Garg
|
3f5fea97fa
|
Delete __init__.py
|
2019-01-16 22:52:07 +05:30 |
|
Saif Ur Rehman
|
502f15ba1b
|
test: test_party_details_tax_category
|
2019-01-12 19:07:39 +05:00 |
|
Saif Ur Rehman
|
8d61794540
|
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
|
2019-01-10 04:23:40 +05:00 |
|
deepeshgarg007
|
8621869d24
|
Created multiple reports and linked them to email digest
|
2019-01-09 21:56:45 +05:30 |
|
Saurabh
|
afec3ca89a
|
Merge branch 'staging' into develop
|
2019-01-08 17:09:36 +05:30 |
|
Saif Ur Rehman
|
380b4b0926
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
|
2019-01-08 13:41:46 +05:00 |
|
Saif
|
e5091cbc0f
|
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
|
2019-01-07 18:19:30 +05:30 |
|
Saif Ur Rehman
|
7ea6554f1f
|
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
|
2019-01-06 04:43:13 +05:00 |
|
Rohit Waghchaure
|
3dc5b93db7
|
[Fix] Report quoted item comparison not working
|
2019-01-03 12:19:44 +05:30 |
|
Suraj Shetty
|
3de12db2b1
|
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
|
2018-12-27 09:05:25 +05:30 |
|