Commit Graph

168 Commits

Author SHA1 Message Date
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
Nabin Hait
10b155a486 cost center based on project 2014-10-23 13:18:59 +05:30
Rushabh Mehta
e10cf021d9 [email] remove communicationlist 2014-09-16 15:12:18 +05:30
Neil Trini Lasrado
d6d71e8078 [fix] issue 448 final 1 2014-08-27 18:48:57 +05:30
Anand Doshi
43f087c99d [hotfix] Supplier read permission for Purchase User
[Fix] Issue 

[Fix] Issue  2
2014-08-26 16:30:39 +05:30
Anand Doshi
bc708ee4c2 [print] Disable rounded total 2014-07-29 22:24:31 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
Nabin Hait
60c48fee16 minor fixes 2014-06-24 17:34:52 +05:30
Nabin Hait
0b15755441 Cost center-wise net profit in financial analytics report 2014-06-24 17:02:45 +05:30
Rushabh Mehta
880b3ef6c0 added qty updating option multi-item selector 2014-06-06 11:45:30 +05:30
Rushabh Mehta
b6843f2087 added multiple item select and allow non purchase items in Material Request of type transfer 2014-06-04 13:10:41 +05:30
Nabin Hait
0984f227a8 minor fixes related to path 2014-05-30 19:10:12 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Pratik Vyas
e1eeb22f1e remove linebreaks for translation strings (js) 2014-04-15 10:50:36 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices 2014-04-11 16:51:27 +05:30
Rushabh Mehta
66d52b55c0 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - 2014-03-26 18:24:30 +05:30
Nabin Hait
0c9d42258c Minor fix related to pos paid amount 2014-03-25 19:35:41 +05:30
Nabin Hait
482ffac83f Set paid amount to zero if not pos 2014-03-21 11:26:07 +05:30
Nabin Hait
54106807e4 Set paid amount to zero if not pos 2014-03-13 17:26:41 +05:30
Rushabh Mehta
d8de921c40 fixed and other pos related cleanups 2014-03-06 15:40:22 +05:30
Nabin Hait
9d1f077922 get lead details in quotation 2014-02-19 17:43:24 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
139dc7b9b2 minor fixes 2014-02-12 14:54:16 +05:30
Nabin Hait
1eb560130a Rename fields: amount related fields 2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21 Field Rename: rate field mass replacement 2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4 Rename fields: initial commit 2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102 commonify get_item_details and rename fields to sync selling and purchase 2014-02-12 14:54:12 +05:30
Rushabh Mehta
347889b233 merge 2014-02-03 14:49:53 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d set default tax type in customer and supplier 2014-01-29 16:31:38 +05:30
Akhilesh Darjee
2ced3b07d4 changed fieldname from charge to taxes 2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597 Merged with 4.0-wip 2014-01-28 15:52:25 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Rushabh Mehta
b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions 2014-01-02 11:47:23 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30