Saif Ur Rehman
bbd1e47758
test: test_tax_calculation_with_item_tax_template
2019-01-12 18:28:15 +05:00
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
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes
...
fix: expense head of asset items in purchase invoice
2019-01-08 20:23:14 +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
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
...
fix: Loyalty program issue fix in customer dashboard
2019-01-08 12:15:57 +05:30
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
848bbac05e
Added patch for Item Tax Template
2019-01-07 05:32:38 +05:00
Saif Ur Rehman
f484f0d6e8
Added test for Tax Rule based on Tax Category
2019-01-07 00:37:01 +05:00
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
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
Saif Ur Rehman
b1288b75ba
fix: Test Records
2019-01-06 04:41:13 +05:00
Anurag Mishra
5865fcca3c
fix: expense head of asset items in purchase invoice
2019-01-02 14:36:07 +05:30
deepeshgarg007
8300f5ede7
fix: Codacy issues and added test case
2019-01-01 20:28:49 +05:30
Saif Ur Rehman
f6a83daae6
fix: update item_tax_template account_type server-side validation
2018-12-29 02:27:03 +05:00
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
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
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue
...
[Fix] Tax Withholding, TDS is applying on the tax
2018-12-25 14:49:05 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Rohit Waghchaure
94500a9d62
[Fix] TDS is applying on the tax
2018-12-24 15:13:52 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +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
deepeshgarg007
4ac8fcf4af
Added test case for Accounts receivable report based on payment terms
2018-12-19 18:43:06 +05:30
Faris Ansari
4994d84565
fix(pos-profile): Cleanup Form for POS Profile ( #16208 )
...
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
2018-12-14 14:19:14 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
RicardoJohann
bc0ef0beca
Add Serial Number button in Delivery Note and Sales Invoice's Packing List ( #16080 )
2018-12-10 17:43:03 +05:30
Deepesh Garg
0c3c148316
Linking company address to pos profile ( #16142 )
...
* Linking company address to pos profile
* Translation fix
2018-12-10 16:22:38 +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
Nabin Hait
dd7b020b01
fix(test): Fixed tests for period closing voucher
2018-12-03 14:24:41 +05:30
Nabin Hait
eda0a6eb33
fix(test): Fixed tests for period closing voucher
2018-11-30 15:15:17 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +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
73ca3cfca6
fix(test): removed test print
2018-11-26 16:16:42 +05:30
Nabin Hait
2665c37f38
temp(travis): Print statement to fix travis
2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097
fix(test): Test cases fixed
2018-11-26 11:05:28 +05:30
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Nabin Hait
688758a56f
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-13 16:13:16 +05:30
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Britlog
9e9e37d39b
[Fix] Conversion factor in offline POS ( #15867 )
2018-11-13 11:34:27 +05:30
