Commit Graph

10911 Commits

Author SHA1 Message Date
Nabin Hait
b7ae9b4283 Merge pull request #2866 from neilLasrado/barcode
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44 minor fixes 2015-02-26 20:29:43 +05:30
Pratik Vyas
7e98eb3ab7 Merge branch 'develop' 2015-02-26 14:46:43 +05:30
Pratik Vyas
8462f4ad2c bumped to version 4.23.0 2015-02-26 15:16:43 +06:00
Pratik Vyas
add4c96280 Merge pull request #2871 from anandpdoshi/anand-feb-26
Fixes in queries and translations
2015-02-26 14:43:27 +05:30
Anand Doshi
45b5da0826 [translations] removed translations that have missing placeholders like {0} 2015-02-26 13:34:24 +05:30
Pratik Vyas
dc24d0151c Merge branch 'develop' 2015-02-26 13:27:41 +05:30
Pratik Vyas
c452b4b7cc bumped to version 4.22.2 2015-02-26 13:57:41 +06:00
Anand Doshi
335763da49 updated translations 2015-02-26 13:20:15 +05:30
Anand Doshi
5bd8cfd9fe [fix] queries 2015-02-26 12:40:58 +05:30
Nabin Hait
851c745fdf Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0 2015-02-26 12:32:04 +05:30
Nabin Hait
8be6939288 help description for party account 2015-02-26 12:31:07 +05:30
Nabin Hait
2ed025e62d Merge pull request #2870 from nabinhait/fix1
Fixes
2015-02-26 11:41:10 +05:30
Nabin Hait
836f9f34e4 warehouse mandatory in sales invoice if update_stock 2015-02-26 11:40:20 +05:30
Nabin Hait
98a8fae7c2 hotfix for fetching default account and warehouse 2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4374692cf5 fixes 2015-02-25 19:01:17 +05:30
Neil Trini Lasrado
4abda67a98 Barcode added to stock entry 2015-02-25 19:01:17 +05:30
Anand Doshi
e474aa5d91 [minor] Product grid text-ellipsis 2015-02-25 18:52:22 +05:30
Nabin Hait
69d874e7d7 Merge pull request #2864 from neilLasrado/delivery-note
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Nabin Hait
690f8b9323 Merge pull request #2868 from nabinhait/fix1
fix in financial statements
2015-02-25 18:35:09 +05:30
Nabin Hait
79ffc2b3a7 fix in financial statements 2015-02-25 18:32:25 +05:30
Rushabh Mehta
a8a2fb225d [fixes] item, test site install 2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4 [fix] default account for manufacturing stock entry should be cogs 2015-02-25 17:15:45 +05:30
Rushabh Mehta
8f62e2448c [fix] patches 2015-02-25 16:28:33 +05:30
Rushabh Mehta
6cdfd1e976 [fix] patches 2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2 [taxes and charges] refactor 2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c [minor] notifications and other fixes to stock 2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc Allow user to change page_name in Item and Item Group #2397 2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed batch field changed to link feild in packed_item 2015-02-25 12:44:45 +05:30
Anand Doshi
28d21ba3c0 [minor] fix build.json 2015-02-24 22:28:26 +05:30
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