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 |
|
Nabin Hait
|
4c08aaef3d
|
Merge pull request #16290 from deepeshgarg007/stock-recon
fix: Unorderable type error while making stock reconciliation entry
|
2019-01-08 11:55:49 +05:30 |
|
Nabin Hait
|
4216d86dd9
|
Merge pull request #16296 from deepeshgarg007/update_items_bug
fix: Validation while updating items in sales order
|
2019-01-08 11:54:52 +05:30 |
|
Nabin Hait
|
49ca9dceb2
|
Merge branch 'staging-fixes' into report-fix
|
2019-01-08 11:53:06 +05:30 |
|
Nabin Hait
|
4e3e784691
|
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
perf: Customer contact column in accounts receivable report
|
2019-01-08 11:52:20 +05:30 |
|
Deepesh Garg
|
7c45f45ebc
|
fix: Divide by zero exception fix in item wise purchase register (#16247)
* Do not prepare row if stock quantity is not available
* Update item_wise_purchase_register.py
|
2019-01-08 08:34:28 +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 |
|
Sagar Vora
|
cad20abe83
|
Merge branch 'staging-fixes' into loyalty-program-fix
|
2019-01-07 15:32:40 +05:30 |
|
Sagar Vora
|
a4af874a43
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-07 15:21:02 +05:30 |
|
Sagar Vora
|
fd78339a7c
|
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison
|
2019-01-07 14:54:44 +05:30 |
|
Sagar Vora
|
26e5c9480b
|
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd
|
2019-01-07 14:30:23 +05:30 |
|
Sagar Vora
|
1310c238a9
|
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
fix: replaced str to cstr in genral ledger report
|
2019-01-07 14:28:27 +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 |
|
Rohit Waghchaure
|
ed6725172d
|
Replaced str to cstr in genral ledger report
|
2019-01-06 20:07:18 +05:30 |
|
Saif Ur Rehman
|
13a6c0aeff
|
Fix tests
|
2019-01-06 18:14:18 +05:00 |
|
Deepesh Garg
|
0eca1646e6
|
Merge branch 'staging-fixes' into loyalty-program-fix
|
2019-01-06 12:16:54 +05:30 |
|
Deepesh Garg
|
4772ae2755
|
Merge branch 'staging-fixes' into stock-recon
|
2019-01-06 12:16:45 +05:30 |
|
Deepesh Garg
|
16745c2553
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-06 12:16:37 +05:30 |
|
Deepesh Garg
|
b12c7358b1
|
Merge branch 'staging-fixes' into report-fix
|
2019-01-06 12:16:11 +05:30 |
|
Deepesh Garg
|
f840c92c10
|
Merge branch 'staging-fixes' into accounts-receivable-fix
|
2019-01-06 10:35:12 +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 |
|
Saif Ur Rehman
|
b1288b75ba
|
fix: Test Records
|
2019-01-06 04:41:13 +05:00 |
|
Frappe Bot
|
0d54271d15
|
bumped to version 11.0.3-beta.33
|
2019-01-05 09:11:14 +00:00 |
|
Deepesh Garg
|
1bb9287b2d
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-04 14:15:40 +05:30 |
|
Sahil Khan
|
3ac57c756b
|
fix: remove print statement from test case
|
2019-01-04 12:57:34 +05:30 |
|
deepeshgarg007
|
eabf260706
|
fix :Test cases for accounts receivable report
|
2019-01-04 12:34:28 +05:30 |
|
deepeshgarg007
|
9de81cda77
|
Added Customer contact column in accounts Receivable
|
2019-01-04 10:54:24 +05:30 |
|
deepeshgarg007
|
32f054b901
|
Added customer group column in item-wise-sales-history report
|
2019-01-03 22:57:18 +05:30 |
|
Rohit Waghchaure
|
8bac5b6e73
|
[minor] Employee is reqd to preview salary slip from salary structure
|
2019-01-03 16:20:35 +05:30 |
|
Rohit Waghchaure
|
3dc5b93db7
|
[Fix] Report quoted item comparison not working
|
2019-01-03 12:19:44 +05:30 |
|
Saif Ur Rehman
|
648bd15b2a
|
Force item_tax_rate on setting item details server-side
|
2019-01-03 04:03:54 +05:00 |
|
Sagar Vora
|
c14c7c84e3
|
fix: leave application and timesheet tests
|
2019-01-02 21:28:11 +05:30 |
|
rohitwaghchaure
|
9c69e40970
|
Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department
[Fix] Not able to delete department
|
2019-01-02 15:58:24 +05:30 |
|
Deepesh Garg
|
74306cc5ea
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-02 14:10:23 +05:30 |
|
deepeshgarg007
|
9c0c633259
|
fix: Added validation for stock reconciliation in stock ledger entry
|
2019-01-02 11:31:55 +05:30 |
|
Charles-Henri Decultot
|
94e35e7a7e
|
Fix #15917 (#16311)
|
2019-01-01 22:25:13 +05:30 |
|
deepeshgarg007
|
8300f5ede7
|
fix: Codacy issues and added test case
|
2019-01-01 20:28:49 +05:30 |
|
deepeshgarg007
|
78ad6c4cb7
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
|
2019-01-01 19:46:08 +05:30 |
|
deepeshgarg007
|
9eb99dc61e
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon
|
2019-01-01 18:40:24 +05:30 |
|
deepeshgarg007
|
318dc422bc
|
Updated test Cases for update_child_rate_qty
|
2019-01-01 18:30:33 +05:30 |
|
deepeshgarg007
|
1451304526
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into update_items_bug
|
2019-01-01 17:13:37 +05:30 |
|
Rohit Waghchaure
|
c186f153ff
|
Added test cases
|
2019-01-01 15:03:56 +05:30 |
|
Rohit Waghchaure
|
8f62aec2e3
|
[Fix] Not able to delete department
|
2019-01-01 14:06:40 +05:30 |
|
Nabin Hait
|
137a24f457
|
Merge pull request #16253 from chdecultot/sales_summary_correction
[Fix] Filter cancelled and draft payments in sales payment summary
|
2018-12-31 12:02:19 +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 |
|
rohitwaghchaure
|
f07cde6351
|
Merge pull request #16306 from rohitwaghchaure/removed_duplicate_fields
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
|
2018-12-28 17:49:52 +05:30 |
|