Nabin Hait
|
90fc19ed9a
|
Item image in print view
|
2015-05-14 12:32:26 +05:30 |
|
Nabin Hait
|
2f243f4d08
|
Merge pull request #3242 from neilLasrado/crm
view leads button added to campaign
|
2015-05-13 19:34:36 +05:30 |
|
Rushabh Mehta
|
92015a1268
|
[fix] [minor] escape in report
|
2015-05-12 11:32:25 +05:30 |
|
Neil Trini Lasrado
|
6c85479e4f
|
view leads button added to campaign
|
2015-05-11 17:56:36 +05:30 |
|
Rushabh Mehta
|
ab1ed013b3
|
[hot] taxes
|
2015-05-08 11:09:25 +05:30 |
|
Rushabh Mehta
|
55dc66ffcc
|
[fix] index for sales order item
|
2015-05-07 18:16:49 +05:30 |
|
Rushabh Mehta
|
009378e187
|
[rename]
|
2015-05-06 22:59:00 +05:30 |
|
Rushabh Mehta
|
bcdea3ea51
|
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
|
2015-05-06 18:45:47 +05:30 |
|
Rushabh Mehta
|
5dbf8a7418
|
[cleanup] frappe.get_user
|
2015-05-01 11:51:26 +05:30 |
|
Nabin Hait
|
aa03a8e3a2
|
Migrate customized precision for newly created total fields
|
2015-04-30 16:13:47 +05:30 |
|
Nabin Hait
|
042f86e555
|
advance paid should not be copied and patch to fix affected records
|
2015-04-28 13:00:23 +05:30 |
|
Rushabh Mehta
|
38c6b52770
|
[rename] group_or_ledger to is_group
|
2015-04-23 13:14:17 +05:30 |
|
Nabin Hait
|
b650d691a0
|
fixed conflict
|
2015-04-21 17:16:28 +05:30 |
|
Nabin Hait
|
2029ea9abf
|
toggle editable price list rate
|
2015-04-16 17:55:35 +05:30 |
|
Nabin Hait
|
c3daa91c8a
|
Reset no-copy fields for recurring docs and patch to fix
|
2015-04-16 13:13:18 +05:30 |
|
Pratik Vyas
|
2437d4cce2
|
Fix #3046 Customer Acquisition and Loyalty repor
|
2015-04-10 12:35:43 +05:30 |
|
Nabin Hait
|
4642d0697e
|
fixed conflict
|
2015-04-09 11:42:24 +05:30 |
|
Anand Doshi
|
0dc79f4de0
|
Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
|
2015-04-06 13:21:07 +05:30 |
|
Rushabh Mehta
|
7c32770a69
|
move opportunity item to CRM
|
2015-04-02 22:06:36 +05:30 |
|
Rushabh Mehta
|
918ddf2537
|
[task] open, close from list:
|
2015-04-01 15:43:14 +05:30 |
|
Rushabh Mehta
|
aefc01372f
|
[listview] issue: open, close | so, po: stop, unstop
|
2015-03-31 13:39:42 +05:30 |
|
Sambhaji Kolate
|
a4fa96cc79
|
some fix in batch related cleanup
|
2015-03-30 16:04:55 +05:30 |
|
Anand Doshi
|
6208c49859
|
Added Company field in various Query Reports
|
2015-03-30 15:21:20 +05:30 |
|
Nabin Hait
|
da5cfb1630
|
Exchange rate upto 9 decimals
|
2015-03-23 14:51:45 +05:30 |
|
Nabin Hait
|
ca7e778f82
|
modified date updated
|
2015-03-23 14:17:59 +05:30 |
|
Nabin Hait
|
2ed71bac20
|
Batch related cleanup
|
2015-03-20 15:06:30 +05:30 |
|
Nabin Hait
|
60aee54c6c
|
currency in test records
|
2015-03-18 16:06:13 +05:30 |
|
Nabin Hait
|
87ee502dfd
|
Merge pull request #2949 from sbktechnology/develop
update get_batch_no query to sort batch with expiry date
|
2015-03-18 14:29:13 +05:30 |
|
Nabin Hait
|
a1bf43b1a6
|
Merged develop into v5
|
2015-03-17 10:50:47 +05:30 |
|
Nabin Hait
|
f2791f8898
|
manipulate_grand_total_for_inclusive_tax
|
2015-03-16 17:01:09 +05:30 |
|
Anand Doshi
|
ead48094b6
|
manipulate diff only if diff <= 0.02
|
2015-03-13 18:59:01 +05:30 |
|
Anand Doshi
|
d6822ddd7c
|
manipulate grand total for inclusive tax
|
2015-03-13 18:23:10 +05:30 |
|
Anand Doshi
|
9d9e31f4e8
|
moved get_list_context to module
|
2015-03-13 12:48:05 +05:30 |
|
Nabin Hait
|
7c9d003917
|
Test case cleanup and fixes
|
2015-03-13 08:14:46 +05:30 |
|
Nabin Hait
|
c8c1d1c693
|
Test case fixes
|
2015-03-13 08:14:45 +05:30 |
|
Sambhaji Kolate
|
feff40a930
|
update get_batch_no query to sort batch with expiry date
small fix to avoid error msg if item_code not selected and batch_no is entered
|
2015-03-11 11:50:28 +05:30 |
|
Sambhaji Kolate
|
845f1c636e
|
code cleanup
|
2015-03-10 15:19:29 +05:30 |
|
Sambhaji Kolate
|
98dbccd1d6
|
added actual_batch_qty at warehouse in DN & SI #1873
|
2015-03-10 15:04:28 +05:30 |
|
Rushabh Mehta
|
f5f0d5a83a
|
[breadcrumbs] refactor
|
2015-03-09 15:48:16 +05:30 |
|
Anand Doshi
|
e514323be4
|
load all js and css like before in desk.html
|
2015-03-06 13:17:26 +05:30 |
|
Nabin Hait
|
b50833a1e8
|
Fields alignment
|
2015-03-04 16:14:02 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Anand Doshi
|
5bd8cfd9fe
|
[fix] queries
|
2015-02-26 12:40:58 +05:30 |
|
Nabin Hait
|
8be6939288
|
help description for party account
|
2015-02-26 12:31:07 +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
|
93b3a37a3b
|
rounding issue and rate trigger
|
2015-02-24 17:08:51 +05:30 |
|
Nabin Hait
|
903c42a130
|
multiplefixes
|
2015-02-24 15:24:49 +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
|
82e3e25cdb
|
fixes for base_rate, base_amount, tax_amount: mass search and replace
|
2015-02-24 10:02:28 +05:30 |
|