Rushabh Mehta
|
1e8025b327
|
[cleanup] yes/no selects changed to checks in Item
|
2015-07-29 11:38:33 +05:30 |
|
Nabin Hait
|
1d21842f68
|
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
|
2015-07-24 13:26:53 +05:30 |
|
Neil Trini Lasrado
|
09a66c4201
|
Fixed issue with Customer Contacts in Transaction Documents
|
2015-07-13 12:41:27 +05:30 |
|
Neil Trini Lasrado
|
ed8cecbdd8
|
Sales BOM renamed to Product Bundle
|
2015-07-13 12:41:27 +05:30 |
|
Neil Trini Lasrado
|
ebb60f5dbc
|
Fixed issues in Expired Batches while making Stock Entry
|
2015-07-08 15:24:02 +05:30 |
|
Neil Trini Lasrado
|
d015195617
|
fixes in barcode
|
2015-06-09 15:21:50 +05:30 |
|
Rushabh Mehta
|
c2acfc9828
|
[fix] clear barcode from table, fixes #3320
|
2015-05-27 12:01:03 +05:30 |
|
Rushabh Mehta
|
ab1ed013b3
|
[hot] taxes
|
2015-05-08 11:09:25 +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 |
|
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 |
|
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 |
|
Sambhaji Kolate
|
a4fa96cc79
|
some fix in batch related cleanup
|
2015-03-30 16:04:55 +05:30 |
|
Nabin Hait
|
2ed71bac20
|
Batch related cleanup
|
2015-03-20 15:06:30 +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 |
|
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 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Nabin Hait
|
7b19b9ed02
|
minor fixes
|
2015-02-24 10:04:00 +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
|
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
|
de9c8a9028
|
discount calculation and in print view
|
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
|
188f69a713
|
commonified totals calculation in js
|
2015-02-12 17:55:50 +05:30 |
|
Nabin Hait
|
5690be103c
|
Replaced renamed total fields in code files
|
2015-02-12 16:09:11 +05:30 |
|
Nabin Hait
|
7945712171
|
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
|
2015-02-11 12:55:10 +05:30 |
|
Nabin Hait
|
15cd12214e
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:37:18 +05:30 |
|
Nabin Hait
|
5e13e0c316
|
net_total and grand_total mismatch issue
|
2015-02-05 17:18:03 +05:30 |
|
Nabin Hait
|
b4a3dfa893
|
All the calculations in taxes_and_totals file
|
2015-01-22 17:13:13 +05:30 |
|
Nabin Hait
|
963393409e
|
minor fix: child table length
|
2015-01-21 17:22:11 +05:30 |
|
Nabin Hait
|
239c2c327c
|
Hide currency and price list section after submission
|
2015-01-15 14:22:04 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Nabin Hait
|
2244ac4d52
|
Discount amount in party currency
|
2015-01-12 17:35:37 +05:30 |
|
Anand Doshi
|
50d7e8cf8f
|
[design] Point of Sale
|
2015-01-06 17:14:26 +05:30 |
|
Nabin Hait
|
5515b1ea7f
|
minor fix
|
2015-01-05 08:18:15 +05:30 |
|
Nabin Hait
|
8a00319962
|
minor fix
|
2015-01-04 17:27:40 +05:30 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Rushabh Mehta
|
6d950d23a8
|
[merge]
|
2014-11-28 12:08:51 +05:30 |
|
Nabin Hait
|
ccd9fd3e94
|
Rounding in totals calculation
|
2014-11-14 14:27:24 +05:30 |
|
Nabin Hait
|
ae1dcabcb5
|
Fixed merge conflict
|
2014-11-05 12:41:02 +05:30 |
|
Neil Trini Lasrado
|
6fc2821e5f
|
fix - validations added for auto fetch of cost center
|
2014-10-28 14:36:26 +05:30 |
|