Nabin Hait
|
6123560f51
|
Merge pull request #5076 from vjFaLk/develop
Fix for Opportunity
|
2016-03-31 11:55:07 +05:30 |
|
Nabin Hait
|
1d04a23a00
|
Merge pull request #5082 from umairsy/perm-issue-2
[Fix] changed permission for the Stock Ledger Entry
|
2016-03-31 11:54:28 +05:30 |
|
Nabin Hait
|
b664cabeef
|
Merge pull request #5096 from nabinhait/test_case_fix
Test case fix
|
2016-03-31 11:53:07 +05:30 |
|
Rushabh Mehta
|
2d985e1973
|
[fix] edit-profile in frappe;
|
2016-03-30 17:15:33 +05:30 |
|
Rushabh Mehta
|
72b4ad8155
|
[cleanup] for quick-entry
|
2016-03-30 15:42:22 +05:30 |
|
Nabin Hait
|
9501a1e034
|
Links for fixed assets added in accounts module page
|
2016-03-30 15:06:26 +05:30 |
|
Nabin Hait
|
684052e978
|
[fix] Permissions added in asset and asset category
|
2016-03-30 15:06:25 +05:30 |
|
Nabin Hait
|
7fcec4118b
|
[fix] Test case
|
2016-03-30 15:06:25 +05:30 |
|
Anand Doshi
|
62ae39441d
|
Merge pull request #5091 from rmehta/portal-settings
[enhancement] configurable portal menu, fixes #5087
|
2016-03-30 14:38:11 +05:30 |
|
Rushabh Mehta
|
3fc6fdeba0
|
[cleanup] for quick-entry
|
2016-03-30 13:18:30 +05:30 |
|
Rushabh Mehta
|
c78b3110b5
|
[enhancement] configurable portal menu;
|
2016-03-30 12:29:48 +05:30 |
|
Rushabh Mehta
|
df7e523c3f
|
[fix] web forms for collaborative pm
|
2016-03-30 11:00:42 +05:30 |
|
Rushabh Mehta
|
8b43fd7f02
|
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
UI Changes
|
2016-03-29 18:45:58 +05:30 |
|
Kanchan Chauhan
|
b566d42d37
|
UI Changes
|
2016-03-29 18:21:59 +05:30 |
|
Nabin Hait
|
e8e2d406b5
|
minor fix
|
2016-03-29 18:17:03 +05:30 |
|
Rushabh Mehta
|
bb8c6de043
|
[opt] transaction.js
|
2016-03-29 17:52:22 +05:30 |
|
Rushabh Mehta
|
652dee45a6
|
[minor] make margin collapsible
|
2016-03-29 16:42:13 +05:30 |
|
Rushabh Mehta
|
1d05ada5e9
|
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
Fixed asset depreciation
|
2016-03-29 16:39:31 +05:30 |
|
Rushabh Mehta
|
7a1b5da830
|
[cleanup] request for quotation cleanup
|
2016-03-29 16:04:43 +05:30 |
|
Rushabh Mehta
|
22fe3a8b7e
|
Merge pull request #5081 from nabinhait/trans_fix
[fix] Translations
|
2016-03-29 15:16:07 +05:30 |
|
Rushabh Mehta
|
b5aa50de06
|
[fix] select default company in chart of accounts
|
2016-03-29 14:41:20 +05:30 |
|
Umair Sayyed
|
6481ab23ce
|
[Fix] changed permission for stock ledger entry
|
2016-03-29 13:35:46 +05:30 |
|
Nabin Hait
|
d9449e396f
|
[fix] Translations
|
2016-03-29 13:22:31 +05:30 |
|
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 |
|
Nabin Hait
|
fb03b96992
|
fixed asset fixes
|
2016-03-29 11:54:38 +05:30 |
|
Nabin Hait
|
7de15321c9
|
[docs] Managing fixed assets
|
2016-03-29 11:54:38 +05:30 |
|
Nabin Hait
|
fc937ee370
|
[docs] managing fixed assets
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
06a41aca13
|
fixed asset: related accounts added in default chart of accounts
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
7536349f17
|
Fixed asset: status, restore, testcase and much more
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
4d668dbaa3
|
[tests] creation of asset and asset category
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
4fdb05228d
|
fixed asset depreciation
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
3a15c92c5e
|
Fixed Asset Depreciation first commit
|
2016-03-29 11:54:37 +05:30 |
|
Rushabh Mehta
|
3117b4b8d6
|
[fix] minor for quick-entry
|
2016-03-29 11:53:17 +05:30 |
|
Valmik Jangla
|
29563275f5
|
Fix for Opportunity
|
2016-03-29 11:18:36 +05:30 |
|
Rushabh Mehta
|
9904c5acf4
|
Merge pull request #5050 from neilLasrado/develop
Fixes Translations
|
2016-03-29 10:51:44 +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 |
|
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 |
|
rohitwaghchaure
|
f3f2ecf968
|
[fixes] Set default company's letter head in purchase flow
|
2016-03-25 12:57:50 +05:30 |
|
Kanchan Chauhan
|
53ce94f9bd
|
Minor fixes
|
2016-03-25 12:04:54 +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 |
|
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 |
|
DrTrills
|
6e9c8916c0
|
Update quotes.py
Added a fun fact to change it up
|
2016-03-23 18:27:34 -04:00 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|