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
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
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
d2e2ca31ac
Merge pull request #16460 from nabinhait/pricing-rule-issue
...
fix: Enforce pricing rule based on rate on server side
2019-01-23 12:09:12 +05:30
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes
...
style: Linting fixes
2019-01-23 12:08:57 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f79937d64b
style: Remove unused imports
2019-01-23 00:28:37 +05:30
Nabin Hait
da32916396
fix: Enforce pricing rule based on rate on server side
2019-01-22 19:06:06 +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
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Rohit Waghchaure
f725816809
Enhance: Added field limit in the Payment Reconciliation to handle large entries
2019-01-17 12:54:14 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix
2019-01-16 17:52:30 +05:30
Sahil Khan
34766c0c50
BIS issue fixes
2019-01-16 15:59:39 +05:30
Saif Ur Rehman
5085673030
test: fix for Item Tax Template v12
2019-01-11 03:53:43 +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
Saif Ur Rehman
eb7277d2d4
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Nabin Hait
bf0b6fd8a9
Merge pull request #16342 from finbyz/staging-fixes
...
fix: rounded total if available while caclulating advance paid
2019-01-08 20:29:32 +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
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Sagar Vora
f5a00dc0c1
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
2019-01-07 15:45:33 +05:30
Sagar Vora
f733a39089
fix: remove trailing whitespace
2019-01-07 14:24:01 +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
finbyz
5efc7973ea
Minor Fix for Rounded Total
2019-01-05 11:12:11 +05:30
Saif Ur Rehman
648bd15b2a
Force item_tax_rate on setting item details server-side
2019-01-03 04:03:54 +05:00
Anurag Mishra
0885485a61
changes
2019-01-01 15:00:16 +05:30
Anurag Mishra
0c8411d085
test cases sucess
2018-12-28 16:53:00 +05:30
deepeshgarg007
77cde832d6
Added validation for update items in purchase order as well
2018-12-27 15:56:51 +05:30
deepeshgarg007
ffb411d9e2
Validation while updating items in sales order
2018-12-27 14:12:05 +05:30
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
Rushabh Mehta
fafbb0278f
fix: reload parent after setting children
2018-12-24 22:09:15 +05:30
Rushabh Mehta
c9b1a35ac3
fix: set explicit idx for new item in update_child_qty_rate
2018-12-24 20:55:35 +05:30
Nabin Hait
5a9579bae4
feat(quality): Check quality status before receipt/delivery ( #16169 )
2018-12-24 14:54:42 +05:30
Shreya Shah
d2b9093ecc
fix: Check if items exist ( #16248 )
2018-12-24 14:21:07 +05:30
Rohit Waghchaure
f6f503a1f6
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
2018-12-19 15:15:35 +05:30
Stavros Anastasiadis
3d82b74ea4
Update Items in Submit state can add new row ( #15644 )
...
* Update Items in Sumbit state can add new row
In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items
* Remove unused code line
* Remove blocking db save thread line
* Remove Company as not standard Field in Purchase Order Item
* Minor indentation fix
* Add Unit Test, add new row in update_child_qty_rate
* Codacy fix
2018-12-10 17:30:55 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes
2018-11-28 08:12:48 +00:00
Nabin Hait
96598936ad
fix(test): Fixed tests for discount with margin and period closing voucher
2018-11-27 17:48:13 +05:30
Nabin Hait
e4cc062cf1
Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total
...
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 13:22:50 +05:30
Nabin Hait
72fc1b57be
Merge pull request #16083 from Anurag810/new-fix-branch
...
[fix] delivery note with quantity equal 0 #14211
2018-11-27 13:10:31 +05:30
Nabin Hait
6743219dc2
Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice
...
[Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice
2018-11-27 13:09:16 +05:30
