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 |
|
Rohit Waghchaure
|
9835c89e17
|
Added test cases
|
2019-04-06 12:29:05 +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 |
|
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 |
|
Saif Ur Rehman
|
677866824a
|
More work on Tax Category and Item Tax Template
|
2018-12-27 02:11:07 +05:00 |
|
Frappe Bot
|
9e09b3adbe
|
Merge branch 'staging' into develop
|
2018-12-26 12:16:20 +00:00 |
|
Frappe Bot
|
e8c2fdfb8c
|
Merge branch 'master' into staging-fixes
|
2018-12-26 11:44:09 +00:00 |
|
Suraj Shetty
|
146be9f6a6
|
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
|
2018-12-24 16:08:43 +05:30 |
|
Suraj Shetty
|
83e3c4c0fa
|
Fix quote error
|
2018-12-24 11:11:04 +05:30 |
|
Suraj Shetty
|
b2965001d1
|
Replace 'Make' with 'Create'
|
2018-12-23 13:25:58 +05:30 |
|
Saif Ur Rehman
|
8ac261750b
|
Add and Modified DocTypes for Item Tax Template
|
2018-12-22 02:51:59 +05:00 |
|
Frappe Bot
|
1b7c583c48
|
Merge branch 'staging' into develop
|
2018-12-21 05:46:23 +00:00 |
|