Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
ad3fd5166b
update stock uo in sle for DN
2015-02-20 14:23:58 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
dc65dc3778
rename patch
2015-01-27 12:27:10 +05:30
Neil Trini Lasrado
81b98261ae
patch fix
2015-01-27 11:28:56 +05:30
Neil Trini Lasrado
40a9f6f8e9
patch fix
2015-01-23 15:32:35 +05:30
Neil Trini Lasrado
f0b0464cce
patch for is_batch_item
2015-01-23 15:32:35 +05:30
Nabin Hait
3f671ea60f
Landed Cost Voucher: Add field and fixed reposting issue
2015-01-21 14:08:06 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
f34c96bf7a
minor fix
2015-01-14 11:49:04 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Nabin Hait
ebc4ae7892
patch fixes
2015-01-02 12:46:49 +05:30
Nabin Hait
cbdfb767a9
patch fix
2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
89c52eacc7
Actual operation cost in stock entry, fixed cost removed from bom and workstation
2014-12-23 17:39:00 +05:30
Pratik Vyas
387e1e21cb
add reload_doc in a few patches
2014-12-18 11:36:23 +05:30
Nabin Hait
4b83403a63
Fixed bom patch
2014-12-12 11:28:58 +05:30
Neil Trini Lasrado
6ddc487fb6
patch fix
2014-12-11 17:33:41 +05:30
Neil Trini Lasrado
3a34cadcb2
Fix - Total Fixed Cost with patch
2014-12-11 17:15:12 +05:30
Nabin Hait
1caa1a3708
Fixed party model patch
2014-11-28 11:26:35 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
5086ef2499
Update update_requested_and_ordered_qty.py
2014-11-05 12:33:29 +05:30
Nabin Hait
9114c26857
Patch to recalculate requested qty and ordered qty for all items
2014-11-04 15:34:03 +05:30
Nabin Hait
98050e7646
default receivable / payable accounts in company
2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba
Add default party accounts in customer/supplier
2014-11-03 15:46:15 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Nabin Hait
2348a5f592
repost stock utility
2014-10-15 15:31:33 +05:30
Nabin Hait
b2f32dac1b
Minor fix
2014-10-15 14:42:18 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Neil Trini Lasrado
c40451ee2e
Patch Fixed
2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185
Fix - BOM calculated wrong cost on update cost
2014-10-14 12:14:38 +05:30
Nabin Hait
8a28ccfa2f
Repost gl entries where mismatch with stock balance
2014-10-14 11:41:56 +05:30
Pratik Vyas
e435592d64
[minor] Fix default website style patch (reload doc)
2014-10-09 11:22:12 +05:30
Nabin Hait
bd1c8aff8e
Deleted customer/supplier account head report
2014-10-06 13:14:02 +05:30
Nabin Hait
8f44f03cba
Party model patch
...
- Create receivable / payable account, set them in company
- Set party in JV and GL Entry
- Delete all exisintg individual party account
2014-10-06 13:13:27 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Neil Trini Lasrado
3a19a71262
patch fixed
2014-09-30 14:48:38 +05:30
Neil Trini Lasrado
29d1a1c593
manufacturing and repack sepreted, test cases fixed, patch fixed
2014-09-30 14:07:56 +05:30
Nabin Hait
82d7c0c9eb
Patch: Fix gl entries for stock transactions
2014-09-29 15:07:51 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Neil Trini Lasrado
e9882e12ba
Cost of Production cycle
2014-09-12 11:25:03 +05:30
Nabin Hait
3f4885e342
repost stock reconciliation
2014-09-02 20:02:24 +05:30
