Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,805 Commits 3 Branches 0 Tags 1 GiB
e8e9440b06
Commit Graph

14805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a720c89535 [docs] documentation for adding margin in Quoation and SO 2016-03-24 14:07:51 +05:30
mbauskar
c1331d0e8e [minor-fix] pricing rule test-case fix 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
6f60339e75 [fix] total margin calculations 2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d [fix] calculated rate on py side, added depends on for sales order 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
46c97c6e95 [fix] discount percentage fix 2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa [fix] added eval for total margin and margin rate field 2016-03-24 14:07:50 +05:30
mbauskar
e40736c105 test case for quotation 2016-03-24 14:07:49 +05:30
mbauskar
b8b56f127f fetched the markup type and rate of selected item 2016-03-24 14:07:49 +05:30
mbauskar
c79415eb96 added rate and total margin in price_list 2016-03-24 14:07:49 +05:30
mbauskar
36b5189163 calculated the rate and total margin 2016-03-24 14:07:49 +05:30
mbauskar
c97becbd15 added document type in args 2016-03-24 14:07:49 +05:30
mbauskar
5738dd473c set the target.ignore_pricing_rule to 0 2016-03-24 14:07:49 +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
mbauskar
ea60c635ab changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0 2016-03-24 14:07:48 +05:30
mbauskar
8c8fa17a9b [new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item 2016-03-24 14:07:48 +05:30
Rushabh Mehta
cd66c5c972 Merge pull request #5052 from DrTrills/patch-2 
Update quotes.py
 2016-03-24 13:01:13 +05:30
DrTrills
6e9c8916c0 Update quotes.py 
Added a fun fact to change it up
 2016-03-23 18:27:34 -04:00
Anand Doshi
622837fcac [travis] 2016-03-23 22:27:02 +05:30
Anand Doshi
bc04489b85 [travis] 2016-03-23 22:22:27 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Umair Sayyed
99a686237a On Task, added default filter, Status=Open 2016-03-23 15:00:51 +05:30
Rushabh Mehta
1058bd0ae0 Merge pull request #5046 from KanchanChauhan/PMForms 
Added task and issue webforms and few fixes
 2016-03-23 14:50:14 +05:30
Kanchan Chauhan
e14389ec6e Added task and issue webforms and few fixes 2016-03-23 14:14:38 +05:30
Rushabh Mehta
2d832bba70 Merge pull request #5043 from neilLasrado/warehouse 
Validate purchase item only if material request type is purchase
 2016-03-23 12:28:07 +05:30
Neil Trini Lasrado
240f629458 Validate purchase item only if material request type is purchase 2016-03-23 12:13:23 +05:30
Anand Doshi
1947b1784e [minor] removed typo in order.html 2016-03-23 12:12:41 +05:30
Nabin Hait
7504ea7033 [fix] Reset recurring id on amendment 2016-03-23 12:07:34 +05:30
Rushabh Mehta
bd8d288255 Merge pull request #4993 from KanchanChauhan/collaborativeprojectmanagement 
[WIP] Collaborative Project Management first commit
 2016-03-23 12:02:22 +05:30
Anand Doshi
6a17205dcd Merge pull request #5042 from frappe/revert-5028-paypal-cleanup 
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
 2016-03-23 11:59:39 +05:30
Anand Doshi
a75fe1a4c3 Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps" 2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c Merge pull request #5028 from anandpdoshi/paypal-cleanup 
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
 2016-03-23 11:50:46 +05:30
Rushabh Mehta
17da0b8f8b Merge pull request #5035 from rmehta/warehouse-buttons 
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
 2016-03-23 11:50:30 +05:30
Rushabh Mehta
1e7ca6c77a Merge pull request #5023 from nabinhait/balance_sheet_opening 
[fix][balance sheet] Check if precious fiscal  year is closed
 2016-03-23 11:46:13 +05:30
Rushabh Mehta
b07b06dde0 Merge pull request #5011 from neilLasrado/develop 
[WIP] - Added Project to Manufacturing
 2016-03-23 11:45:35 +05:30
Nabin Hait
76db1d702f Merge pull request #5034 from rmehta/letter-head-in-salary 
[fix] default letter in salary slip comes from customized default or company and optimized boot for curreny
 2016-03-23 11:38:20 +05:30
Rushabh Mehta
3cc9b3ef08 [enhancement] [minor] stock ledger, general ledger buttons in warehouse 2016-03-22 16:18:01 +05:30
Kanchan Chauhan
2ad801cfd8 Minor Updates 2016-03-22 16:00:41 +05:30
Rushabh Mehta
e29192c197 [fix] default letter in salary slip comes from customized default or company and optimized boot for curreny 2016-03-22 14:52:25 +05:30
Rushabh Mehta
79a6fc9a84 [fix] recurring patch for purchase 2016-03-22 11:01:31 +05:30
Anand Doshi
71b90b7b7d [cleanup] PayPal payment UX and moved related methods to hooks of respective apps 2016-03-21 17:50:02 +05:30
Rushabh Mehta
97e523b4a4 Merge branch 'develop' 2016-03-21 17:25:09 +05:30
Rushabh Mehta
09ec13f7cf bumped to version 6.27.3 2016-03-21 17:55:09 +06:00
Rushabh Mehta
2179cd97c8 Merge pull request #5026 from nabinhait/modified_fix 
[fix] Updated modified datetime
 2016-03-21 17:23:28 +05:30
Nabin Hait
c8baa01e9c [fix] Updated modified datetime 2016-03-21 17:20:03 +05:30
Rushabh Mehta
dda0906458 Merge branch 'develop' 2016-03-21 15:45:22 +05:30
Rushabh Mehta
cd04380149 bumped to version 6.27.2 2016-03-21 16:15:21 +06:00