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
|
da858cc587
|
Website Product Image
|
2015-02-24 17:52:09 +05:30 |
|
Nabin Hait
|
93b3a37a3b
|
rounding issue and rate trigger
|
2015-02-24 17:08:51 +05:30 |
|
Rushabh Mehta
|
b620fed762
|
[fixes] [minor]
|
2015-02-24 16:51:22 +05:30 |
|
Nabin Hait
|
7ce2f55ca9
|
print_hide for total_taxes_and_charges in buying
|
2015-02-24 16:06:14 +05:30 |
|
Nabin Hait
|
72c359afa2
|
valuation type charges can not be inclusive
|
2015-02-24 16:05:19 +05:30 |
|
Nabin Hait
|
903c42a130
|
multiplefixes
|
2015-02-24 15:24:49 +05:30 |
|
Rushabh Mehta
|
99d0941008
|
[time logs] fixes
|
2015-02-24 14:48:11 +05:30 |
|
Nabin Hait
|
9524ee7ec6
|
tax amount in print
|
2015-02-24 14:43:14 +05:30 |
|
Anand Doshi
|
13b3b070e3
|
Merge pull request #2843 from anandpdoshi/anand-feb-24
[fix] Added unicode_literals if missing in py files
|
2015-02-24 14:16:05 +05:30 |
|
Nabin Hait
|
d5616cd977
|
reload journal entry on patch
|
2015-02-24 13:12:13 +05:30 |
|
Nabin Hait
|
b923f8a78b
|
project milestone patch fix
|
2015-02-24 13:05:49 +05:30 |
|
Nabin Hait
|
20256fa716
|
Merge pull request #2842 from nabinhait/foreign_currency_calc
Foreign currency calc
|
2015-02-24 12:56:57 +05:30 |
|
Anand Doshi
|
2878cc7757
|
[fix] get bom items query
|
2015-02-24 12:39:42 +05:30 |
|
Anand Doshi
|
d57e793bf3
|
[fix] Added unicode_literals if missing in py files
|
2015-02-24 12:24:53 +05:30 |
|
Nabin Hait
|
7b19b9ed02
|
minor fixes
|
2015-02-24 10:04:00 +05:30 |
|
Nabin Hait
|
6dfbc2465b
|
Patch: taxes and totals in party currency
|
2015-02-24 10:04:00 +05:30 |
|
Nabin Hait
|
82e3e25cdb
|
fixes for base_rate, base_amount, tax_amount: mass search and replace
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
37b047d9a8
|
Fields added in all sales and purchase doctypes
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
613d081a60
|
Validate taxes and charges input, commonified
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
34afcfb4a1
|
Print without amount in delivery note
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
e9eec93be7
|
minor fix
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
f0bc9b6d3a
|
Renamed Net total to Total and dynamic label
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
755ff60313
|
tax amount conversion in client side printing
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
de9c8a9028
|
discount calculation and in print view
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
2b019ed430
|
Fixes for discount amount
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
ce24512ed7
|
Commonified sales/purchase taxes and charges master.js code
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
e7679703cf
|
Taxes and totals calculation in party currency
|
2015-02-24 10:02:27 +05:30 |
|
Pratik Vyas
|
81d96fdb60
|
Merge pull request #2839 from pdvyas/v5-lang
update translations and patch to new format
|
2015-02-23 23:51:29 +05:30 |
|
Anand Doshi
|
f9fc04ce8e
|
Website Listing
|
2015-02-23 22:34:27 +05:30 |
|
Rushabh Mehta
|
a1da88a3d3
|
[capacity planning] automatically plan Time Logs from Production Order
|
2015-02-23 20:18:38 +05:30 |
|
Rushabh Mehta
|
93b2f167f8
|
[fixes] opportunity, task minor
|
2015-02-23 14:43:16 +05:30 |
|
Rushabh Mehta
|
281dc5d639
|
[patch] added item patch
|
2015-02-23 14:43:15 +05:30 |
|
Rushabh Mehta
|
d06c1188a0
|
[item] patches
|
2015-02-23 14:43:15 +05:30 |
|
Rushabh Mehta
|
d54031f3b5
|
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
|
2015-02-22 22:32:39 +05:30 |
|
Rushabh Mehta
|
65a2759432
|
[minor] opportunity / item
|
2015-02-21 17:35:50 +05:30 |
|
Rushabh Mehta
|
7bbbda162c
|
[warranty claim] ux - serial no on top
|
2015-02-21 14:49:17 +05:30 |
|
Rushabh Mehta
|
364054a6fc
|
[fix] payment tool #2791
|
2015-02-21 14:39:35 +05:30 |
|
Rushabh Mehta
|
e8a37949cf
|
[issue fixes] + added fixtures for item attribute and operation
|
2015-02-20 20:10:11 +05:30 |
|
Rushabh Mehta
|
e9b3092167
|
Merge pull request #2805 from frappe/pdvyas-patch-1
Update transaction_base.py
|
2015-02-20 16:23:36 +05:30 |
|
Pratik Vyas
|
7f9489e814
|
Update transaction_base.py
|
2015-02-20 16:22:24 +05:30 |
|
Rushabh Mehta
|
813f0eda05
|
[form] section labels
|
2015-02-20 16:02:48 +05:30 |
|
Rushabh Mehta
|
bcccfa09f2
|
[patch] [fix]
|
2015-02-20 15:28:50 +05:30 |
|
Pratik Vyas
|
62ab126ca9
|
update translations and patch to new format
|
2015-02-20 15:20:37 +05:30 |
|
Rushabh Mehta
|
dc93e0adc6
|
[fixes] stock reco
|
2015-02-20 15:11:56 +05:30 |
|
Nabin Hait
|
4d32afde30
|
Merge pull request #2804 from nabinhait/fix1
update stock uom in sle for DN
|
2015-02-20 14:24:52 +05:30 |
|
Nabin Hait
|
ad3fd5166b
|
update stock uo in sle for DN
|
2015-02-20 14:23:58 +05:30 |
|
Nabin Hait
|
010657145d
|
Merge pull request #2803 from sbktechnology/develop
fixed stock_balance report for stock_uom #2802
|
2015-02-20 14:14:14 +05:30 |
|
Sambhaji Kolate
|
973f78e7d3
|
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
|
2015-02-20 13:09:39 +05:30 |
|
Rushabh Mehta
|
d51a47155b
|
[fixed] #2614
|
2015-02-20 10:39:39 +05:30 |
|