mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
2016-03-24 14:07:50 +05:30
mbauskar
1e428ae400
[fix] function to calculate the revised margin and rate
2016-03-24 14:07:50 +05:30
mbauskar
1e9c1640fa
triggers on Margin type and Margin rate fields to calculate the revised Total Margin and Rate
2016-03-24 14:07:49 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Saurabh
5ada14b887
[fixes] calculate valuation rate for non stock item
2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3
[enhancement] get valuation rate and gross profit on sales order item
2016-03-09 15:42:00 +05:30
shreyas
cbc18ffdbf
[Partial] Fixed the issue for Territory Item Group Variance report
2016-01-29 15:41:44 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
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
Nabin Hait
10b155a486
cost center based on project
2014-10-23 13:18:59 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
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 #448
[Fix] Issue #448 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 frappe/frappe#478
2014-04-11 16:51:27 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
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 erpnext/frappe#1441 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
webnotes/erpnext#1090 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
