Anand Doshi
|
aad384c669
|
Merge pull request #5078 from umairsy/march2
Manual - Accounts module
|
2016-03-29 11:59:48 +05:30 |
|
Rushabh Mehta
|
c9850f9e04
|
Merge pull request #5077 from frappe/master
Master
|
2016-03-29 11:59:32 +05:30 |
|
Umair Sayyed
|
d6d283b424
|
edited perpetual inventory system
|
2016-03-29 11:57:38 +05:30 |
|
Umair Sayyed
|
cf3c371367
|
update in the Accounts manual
|
2016-03-29 11:57:38 +05:30 |
|
Rushabh Mehta
|
3117b4b8d6
|
[fix] minor for quick-entry
|
2016-03-29 11:53:17 +05:30 |
|
Rushabh Mehta
|
9904c5acf4
|
Merge pull request #5050 from neilLasrado/develop
Fixes Translations
|
2016-03-29 10:51:44 +05:30 |
|
Rushabh Mehta
|
4ccf692f7c
|
Merge branch 'hotfix'
|
2016-03-29 10:49:46 +05:30 |
|
Rushabh Mehta
|
8573aee8b8
|
bumped to version 6.27.5
|
2016-03-29 11:19:46 +06:00 |
|
Rushabh Mehta
|
dab3cdc106
|
Merge pull request #5071 from neilLasrado/pricing-rule-fix
Fixed Issues in Pricing rule
|
2016-03-29 10:18:03 +05:30 |
|
Rushabh Mehta
|
2de1f86009
|
Merge pull request #5070 from vjFaLk/hotfix
Fix for Holiday List in Maintenance Schedule
|
2016-03-29 10:17:27 +05:30 |
|
Rushabh Mehta
|
fd9ead3cb6
|
Merge pull request #5072 from rohitwaghchaure/new_rfq
[Fix] Minor changes
|
2016-03-29 10:10:14 +05:30 |
|
rohitwaghchaure
|
f480f0fd1e
|
[Fix] Minor changes
|
2016-03-28 18:52:59 +05:30 |
|
Rushabh Mehta
|
d3fdbaa261
|
Merge pull request #5041 from nabinhait/recurring_doc_amend
[fix] Reset recurring id on amendment
|
2016-03-28 18:29:44 +05:30 |
|
Rushabh Mehta
|
0a9ad699cf
|
Merge pull request #5047 from umairsy/task-list-fix
On Task, added default filter, Status=Open
|
2016-03-28 18:28:09 +05:30 |
|
Rushabh Mehta
|
e1b20a0b29
|
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
|
2016-03-28 18:27:05 +05:30 |
|
Rushabh Mehta
|
730b66b1dd
|
Merge pull request #4921 from rohitwaghchaure/new_rfq
[enhancement] request for quotation
|
2016-03-28 18:22:02 +05:30 |
|
rohitwaghchaure
|
a1064a6149
|
[enhancement] request for quotation
|
2016-03-28 17:28:45 +05:30 |
|
Neil Trini Lasrado
|
b176dea74e
|
Fixed issues in Pricing Rule if multiple pricing rules existed with same priority
|
2016-03-28 13:23:47 +05:30 |
|
Rushabh Mehta
|
fe027b34a9
|
[bot] first bot
|
2016-03-28 13:21:48 +05:30 |
|
Neil Trini Lasrado
|
b6d9946854
|
Fixes Translations
|
2016-03-28 12:44:05 +05:30 |
|
Valmik Jangla
|
47b89756d9
|
Fix for Holiday List in Maintenance Schedule
|
2016-03-28 12:34:21 +05:30 |
|
rohitwaghchaure
|
6d1b5d618a
|
[enhancement] request for quotation
|
2016-03-28 12:13:07 +05:30 |
|
rohitwaghchaure
|
44d0449895
|
[enhancement] request for quotation
|
2016-03-28 12:13:07 +05:30 |
|
Rushabh Mehta
|
d5bf8253da
|
[fix] job application link, fixes #5066
|
2016-03-28 11:30:05 +05:30 |
|
Rushabh Mehta
|
c20c536f28
|
[fix] [wip] cleanup for collaborative pm
|
2016-03-25 17:22:17 +05:30 |
|
Rushabh Mehta
|
cd4bede04f
|
Merge pull request #5060 from rohitwaghchaure/issue_fixes
[fixes] Set default company's letter head in purchase flow
|
2016-03-25 13:48:58 +05:30 |
|
rohitwaghchaure
|
f3f2ecf968
|
[fixes] Set default company's letter head in purchase flow
|
2016-03-25 12:57:50 +05:30 |
|
Rushabh Mehta
|
ef5ea4579d
|
Merge pull request #5059 from KanchanChauhan/PM-fixes-25Mar
Minor fixes
|
2016-03-25 12:09:47 +05:30 |
|
Kanchan Chauhan
|
53ce94f9bd
|
Minor fixes
|
2016-03-25 12:04:54 +05:30 |
|
Rushabh Mehta
|
aabc634afd
|
Merge branch 'hot-fix-leave-application'
|
2016-03-25 11:30:22 +05:30 |
|
Rushabh Mehta
|
3becd4239f
|
bumped to version 6.27.4
|
2016-03-25 12:00:22 +06:00 |
|
Rushabh Mehta
|
1b5edcbbd8
|
[fix] holiday_list issues in maintenance schedule too
|
2016-03-25 11:22:15 +05:30 |
|
Rushabh Mehta
|
51135a1522
|
[fix] fix get holidays in leave application
|
2016-03-25 11:13:11 +05:30 |
|
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 |
|