Rushabh Mehta
|
2cc585f180
|
[git fixes] salary manager, time log title, notificaitons
|
2015-03-03 16:06:54 +05:30 |
|
Neil Trini Lasrado
|
fd0920fe83
|
Fixes in Appraisal doc
|
2015-03-02 17:33:48 +05:30 |
|
Rushabh Mehta
|
905f8328ab
|
cleanup global defaults, fix #2838:
|
2015-03-02 13:01:39 +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
|
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 |
|
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 |
|
Nabin Hait
|
6dfbc2465b
|
Patch: taxes and totals in party currency
|
2015-02-24 10:04:00 +05:30 |
|
Rushabh Mehta
|
a1da88a3d3
|
[capacity planning] automatically plan Time Logs from Production Order
|
2015-02-23 20:18:38 +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
|
dc93e0adc6
|
[fixes] stock reco
|
2015-02-20 15:11:56 +05:30 |
|
Nabin Hait
|
ad3fd5166b
|
update stock uo in sle for DN
|
2015-02-20 14:23:58 +05:30 |
|
Rushabh Mehta
|
c7a11cc451
|
[usability] [fixes] stock entry and production order
|
2015-02-19 16:28:35 +05:30 |
|
Rushabh Mehta
|
d60acb9f26
|
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
|
2015-02-19 14:53:31 +05:30 |
|
Neil Trini Lasrado
|
e9d45bcb28
|
patch fixes
|
2015-02-18 20:25:44 +05:30 |
|
Neil Trini Lasrado
|
d8b35639d8
|
image feild made hidden
|
2015-02-18 12:33:53 +05:30 |
|
Nabin Hait
|
da5f766dd5
|
fixed conflict
|
2015-02-18 11:55:13 +05:30 |
|
Nabin Hait
|
b120520aa8
|
fixed patches
|
2015-02-18 11:54:08 +05:30 |
|
Neil Trini Lasrado
|
744aec8def
|
activity type fixs
|
2015-02-17 16:12:32 +05:30 |
|
Anand Doshi
|
0fe854692d
|
[fix] add CRM module to user desktop items in patch
|
2015-02-17 14:45:36 +05:30 |
|
Rushabh Mehta
|
06072c1e51
|
[refactor] Material Transfer for Manufacture
|
2015-02-17 11:50:45 +05:30 |
|
Rushabh Mehta
|
46e03eadca
|
[rename] Customer Issue -> Warranty Claim
|
2015-02-17 10:45:50 +05:30 |
|
Rushabh Mehta
|
60cfccbf77
|
[new-module] crm
|
2015-02-17 10:36:54 +05:30 |
|
Nabin Hait
|
15cd12214e
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:37:18 +05:30 |
|
Neil Trini Lasrado
|
41acbff959
|
item name added to BOM
|
2015-02-03 10:59:40 +05:30 |
|
Neil Trini Lasrado
|
dc65dc3778
|
rename patch
|
2015-01-27 12:27:10 +05:30 |
|
Neil Trini Lasrado
|
f0b0464cce
|
patch for is_batch_item
|
2015-01-23 15:32:35 +05:30 |
|
Rushabh Mehta
|
5bceebc6a1
|
[fix] fixes birthday reminders #2021
|
2015-01-23 15:22:30 +05:30 |
|
Nabin Hait
|
3f671ea60f
|
Landed Cost Voucher: Add field and fixed reposting issue
|
2015-01-21 14:08:06 +05:30 |
|
Nabin Hait
|
9ef2e78905
|
Merge pull request #2553 from neilLasrado/mode-of-payment
mode of payment - company wise default account added
|
2015-01-19 14:26:00 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Neil Trini Lasrado
|
bd2ac2f51f
|
mode of payment - company wise default account added
|
2015-01-14 12:00:17 +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
|
56ac3fb29d
|
some fixes for renaming patch
|
2015-01-01 13:40:54 +05:30 |
|
Rushabh Mehta
|
7a8f009116
|
[fixes]
|
2014-12-31 15:34:37 +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
|
57595cf73b
|
fixed merge conflict
|
2014-12-23 18:05:13 +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 |
|
Nabin Hait
|
0f4350dd61
|
capacity planning fixes and cleanup
|
2014-12-23 17:39:00 +05:30 |
|
Neil Trini Lasrado
|
8d34417c44
|
Bom currency feilds changed to type currency and company feild added to BOM
|
2014-12-12 11:33:50 +05:30 |
|
Neil Trini Lasrado
|
3a34cadcb2
|
Fix - Total Fixed Cost with patch
|
2014-12-11 17:15:12 +05:30 |
|
Rushabh Mehta
|
6d950d23a8
|
[merge]
|
2014-11-28 12:08:51 +05:30 |
|
Rushabh Mehta
|
bd9b62ff28
|
[rename] Support Ticket -> Issue
|
2014-11-28 11:46:10 +05:30 |
|
Nabin Hait
|
249bbbc56f
|
fixes during testing version 5
|
2014-11-26 15:35:39 +05:30 |
|
Rushabh Mehta
|
7d36875d6f
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:47 +05:30 |
|
Nabin Hait
|
a6a70a5f35
|
Make email account patch
|
2014-11-12 17:00:42 +05:30 |
|