Nabin Hait
|
1fe50120a3
|
minor fix
|
2015-05-16 12:14:54 +05:30 |
|
Nabin Hait
|
a6ee8290ce
|
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
|
2015-05-15 12:02:27 +05:30 |
|
Nabin Hait
|
e6e456b373
|
message fixed
|
2015-05-13 17:21:44 +05:30 |
|
Nabin Hait
|
ffc7f3fef6
|
Apply default taxes on loading of document
|
2015-05-12 15:07:02 +05:30 |
|
Nabin Hait
|
574d5ff535
|
fetch only stock items as raw materials supplied for subcontracting
|
2015-05-07 16:29:29 +05:30 |
|
Nabin Hait
|
2b3e065efc
|
[fix] taxes and charges input value
|
2015-05-05 16:33:58 +05:30 |
|
kressi
|
d1aa37f521
|
removed attributes from frappe is_website_user
|
2015-05-02 10:24:17 +02:00 |
|
Nabin Hait
|
c5b8f7eb46
|
fix in trends report
|
2015-04-30 16:13:46 +05:30 |
|
Nabin Hait
|
5616ff417c
|
Account type Temporary and removed Aging Date field from all documents
|
2015-04-27 18:08:51 +05:30 |
|
Rushabh Mehta
|
50ce9753e0
|
[minor] added cache in get_value
|
2015-04-27 13:13:50 +05:30 |
|
Rushabh Mehta
|
38c6b52770
|
[rename] group_or_ledger to is_group
|
2015-04-23 13:14:17 +05:30 |
|
Nabin Hait
|
ddaedefb32
|
minor fix for fieldname
|
2015-04-17 15:01:41 +05:30 |
|
Rushabh Mehta
|
9e6812cfab
|
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
Add/Fix Bank Reports Filters
|
2015-04-17 14:17:22 +05:30 |
|
bhupeshg2
|
e2e973f7be
|
Add reqd to bank clearance aummary report
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
|
2015-04-14 23:09:32 +05:30 |
|
Rushabh Mehta
|
4ac3094049
|
[opportunity] status open
|
2015-04-13 16:56:03 +05:30 |
|
Rushabh Mehta
|
c712dc6729
|
[opportunity] status open
|
2015-04-13 16:51:27 +05:30 |
|
Rushabh Mehta
|
fd0f1cb8b7
|
[opportunity] not submittable
|
2015-04-13 16:21:58 +05:30 |
|
Anand Doshi
|
a0630671da
|
[hotfix] batch query
|
2015-04-09 13:34:57 +05:30 |
|
Anand Doshi
|
03cf407574
|
[fix] removed print
|
2015-04-06 19:38:13 +05:30 |
|
Anand Doshi
|
c399709789
|
fixes to test cases
|
2015-04-06 19:29:16 +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 |
|
Anand Doshi
|
731b15edf4
|
[hotfix] taxes and totals
|
2015-04-05 20:09:09 +05:30 |
|
Nabin Hait
|
54c865e77c
|
Landed cost voucher: fixes for serialized item
|
2015-03-27 15:39:06 +05:30 |
|
Nabin Hait
|
2ed71bac20
|
Batch related cleanup
|
2015-03-20 15:06:30 +05:30 |
|
Anand Doshi
|
2b2b639492
|
fixes
|
2015-03-20 14:29:23 +05:30 |
|
Anand Doshi
|
9d8154dd40
|
fixed test cases
|
2015-03-18 16:22: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 |
|
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 |
|
Nabin Hait
|
e2f054cc27
|
transaction date issue in pricing rule fixed
|
2015-03-09 14:54:37 +05:30 |
|
Anand Doshi
|
ec5ec60764
|
Fixed Test Cases
|
2015-03-05 19:31:40 +05:30 |
|
Nabin Hait
|
95ff2d4fed
|
discount loss adjustment in base currency
|
2015-03-04 16:02:21 +05:30 |
|
Nabin Hait
|
25bd84dfcc
|
Discount amount loss adjustment if no taxes or discount applied on net total
|
2015-03-04 15:07:17 +05:30 |
|
Rushabh Mehta
|
2cc585f180
|
[git fixes] salary manager, time log title, notificaitons
|
2015-03-03 16:06:54 +05:30 |
|
Rushabh Mehta
|
e693f794f5
|
[subcontract] refactor, make stock entry from PO
|
2015-03-03 15:50:24 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Nabin Hait
|
86cd4cc739
|
discount related fix
|
2015-02-28 19:12:55 +05:30 |
|
Nabin Hait
|
bc6c360bf1
|
Update accounts_controller.py
|
2015-02-27 23:40:56 +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
|
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
|
72c359afa2
|
valuation type charges can not be inclusive
|
2015-02-24 16:05:19 +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 |
|