This website requires JavaScript.
6d1b5d618a
[enhancement] request for quotation
2016-03-03 14:00:35 +05:30
44d0449895
[enhancement] request for quotation
2016-03-03 14:00:35 +05:30
d5bf8253da
[fix] job application link, fixes #5066
2016-03-28 11:30:05 +05:30
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:19:28 +05:30
cd4bede04f
Merge pull request #5060 from rohitwaghchaure/issue_fixes
2016-03-25 13:48:58 +05:30
f3f2ecf968
[fixes] Set default company's letter head in purchase flow
2016-03-25 12:54:03 +05:30
ef5ea4579d
Merge pull request #5059 from KanchanChauhan/PM-fixes-25Mar
2016-03-25 12:09:47 +05:30
53ce94f9bd
Minor fixes
2016-03-25 12:04:54 +05:30
aabc634afd
Merge branch 'hot-fix-leave-application'
2016-03-25 11:30:22 +05:30
3becd4239f
bumped to version 6.27.4
2016-03-25 12:00:22 +06:00
1b5edcbbd8
[fix] holiday_list issues in maintenance schedule too
2016-03-25 11:22:15 +05:30
51135a1522
[fix] fix get holidays in leave application
2016-03-25 11:13:11 +05:30
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-05 15:10:25 +05:30
a720c89535
[docs] documentation for adding margin in Quoation and SO
2016-02-08 17:31:03 +05:30
c1331d0e8e
[minor-fix] pricing rule test-case fix
2016-01-29 15:44:56 +05:30
75b6fbb6a7
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
2016-01-22 16:49:03 +05:30
b6d19bcfc2
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
2016-01-21 19:59:13 +05:30
6f60339e75
[fix] total margin calculations
2016-01-21 16:10:22 +05:30
dcd8b7773d
[fix] calculated rate on py side, added depends on for sales order item
2016-01-20 12:39:57 +05:30
1e428ae400
[fix] function to calculate the revised margin and rate
2016-01-19 19:52:22 +05:30
46c97c6e95
[fix] discount percentage fix
2016-01-19 19:51:11 +05:30
5e76a1cffa
[fix] added eval for total margin and margin rate field
2016-01-19 19:49:40 +05:30
e40736c105
test case for quotation
2016-01-18 16:33:57 +05:30
b8b56f127f
fetched the markup type and rate of selected item
2016-01-18 16:33:02 +05:30
c79415eb96
added rate and total margin in price_list
2016-01-18 16:32:24 +05:30
36b5189163
calculated the rate and total margin
2016-01-18 16:31:10 +05:30
c97becbd15
added document type in args
2016-01-18 16:28:21 +05:30
5738dd473c
set the target.ignore_pricing_rule to 0
2016-01-18 16:24:57 +05:30
1e9c1640fa
triggers on Margin type and Margin rate fields to calculate the revised Total Margin and Rate
2016-01-18 16:21:25 +05:30
ea60c635ab
changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0
2016-01-18 15:19:29 +05:30
8c8fa17a9b
[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item
2016-01-18 15:11:18 +05:30
cd66c5c972
Merge pull request #5052 from DrTrills/patch-2
2016-03-24 13:01:13 +05:30
6e9c8916c0
Update quotes.py
2016-03-23 18:27:34 -04:00
622837fcac
[travis]
2016-03-23 22:27:02 +05:30
bc04489b85
[travis]
2016-03-23 22:22:11 +05:30
b2269dd326
[fix] back links from project web view
2016-03-23 18:28:50 +05:30
99a686237a
On Task, added default filter, Status=Open
2016-03-23 15:00:07 +05:30
1058bd0ae0
Merge pull request #5046 from KanchanChauhan/PMForms
2016-03-23 14:50:14 +05:30
e14389ec6e
Added task and issue webforms and few fixes
2016-03-23 14:14:38 +05:30
2d832bba70
Merge pull request #5043 from neilLasrado/warehouse
2016-03-23 12:28:07 +05:30
240f629458
Validate purchase item only if material request type is purchase
2016-03-23 12:05:45 +05:30
1947b1784e
[minor] removed typo in order.html
2016-03-23 12:12:38 +05:30
7504ea7033
[fix] Reset recurring id on amendment
2016-03-23 11:16:51 +05:30
bd8d288255
Merge pull request #4993 from KanchanChauhan/collaborativeprojectmanagement
2016-03-23 12:02:22 +05:30
6a17205dcd
Merge pull request #5042 from frappe/revert-5028-paypal-cleanup
2016-03-23 11:59:39 +05:30
a75fe1a4c3
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:24 +05:30
eec21d041c
Merge pull request #5028 from anandpdoshi/paypal-cleanup
2016-03-23 11:50:46 +05:30
17da0b8f8b
Merge pull request #5035 from rmehta/warehouse-buttons
2016-03-23 11:50:30 +05:30
1e7ca6c77a
Merge pull request #5023 from nabinhait/balance_sheet_opening
2016-03-23 11:46:13 +05:30
b07b06dde0
Merge pull request #5011 from neilLasrado/develop
2016-03-23 11:45:35 +05:30
76db1d702f
Merge pull request #5034 from rmehta/letter-head-in-salary
2016-03-23 11:38:20 +05:30
3cc9b3ef08
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
2016-03-22 16:17:54 +05:30
2ad801cfd8
Minor Updates
2016-03-22 16:00:41 +05:30
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
79a6fc9a84
[fix] recurring patch for purchase
2016-03-22 11:01:31 +05:30
71b90b7b7d
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-21 17:50:02 +05:30
97e523b4a4
Merge branch 'develop'
2016-03-21 17:25:09 +05:30
09ec13f7cf
bumped to version 6.27.3
2016-03-21 17:55:09 +06:00
2179cd97c8
Merge pull request #5026 from nabinhait/modified_fix
2016-03-21 17:23:28 +05:30
c8baa01e9c
[fix] Updated modified datetime
2016-03-21 17:20:03 +05:30
dda0906458
Merge branch 'develop'
2016-03-21 15:45:22 +05:30
cd04380149
bumped to version 6.27.2
2016-03-21 16:15:21 +06:00
df3bf5d76b
Merge pull request #5020 from rohitwaghchaure/support_week_14_03_5
2016-03-21 15:42:34 +05:30
833432086b
Merge pull request #5024 from nabinhait/recurring_doc_status
2016-03-21 15:26:40 +05:30
2646f84a30
[patch] Fix delivery and billing status of recurring orders
2016-03-21 15:19:51 +05:30
7364f0cf1c
[patch-fix] remove old patches for web-forms
2016-03-21 14:47:35 +05:30
443a7c13e4
[fix][balance sheet] Check if previous fiscal year is closed
2016-03-21 12:46:15 +05:30
a9ce706bfb
[update] translations
2016-03-21 14:35:36 +05:30
11dafa27ba
Added Project to materail request
2016-03-21 12:38:28 +05:30
c7f53ff318
Added Project filter to Production Planning Tool
2016-03-16 15:59:11 +05:30
49ccac5d95
[formatting] Added between in trends.py
2016-03-20 19:55:17 +05:30
98122a2574
Merge pull request #5013 from agusputra/patch-25
2016-03-21 12:22:01 +05:30
ea768ec132
Merge pull request #5019 from saurabh6790/supp1.0
2016-03-21 12:06:01 +05:30
d00ce6a8cf
Merge pull request #5022 from nabinhait/recurring_fix3
2016-03-21 12:04:56 +05:30
68a628ea1e
[fix] set recurring id after saving
2016-03-21 12:03:16 +05:30
6a277e244c
[fixes] set todays date on employee attendance tool
2016-03-20 19:00:26 +05:30
383b13cdb5
Update allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
2016-03-19 08:31:50 +07:00
f197d42503
Merge branch 'develop'
2016-03-18 16:36:40 +05:30
6d27470401
bumped to version 6.27.1
2016-03-18 17:06:40 +06:00
3f11f0ae44
Merge pull request #5010 from rohitwaghchaure/support_week_14_03_5
2016-03-18 16:35:14 +05:30
277b7fa641
[Enhancement]Fetch default letter head of company on salary structure and salary slip
2016-03-18 16:15:26 +05:30
9a75530c26
[fix] reload doctype for renaming project
2016-03-18 16:19:13 +05:30
dcedac7f25
Merge pull request #5008 from rohitwaghchaure/support_week_14_03_5
2016-03-18 15:41:54 +05:30
cef1086441
[fix]Letterhead not being changed with change in company
2016-03-18 15:03:57 +05:30
d6c59656e8
Merge pull request #5009 from saurabh6790/cart_fixes-1.0
2016-03-18 15:36:06 +05:30
5996b2f1bb
[fix] recurring document logic
2016-03-18 15:19:54 +05:30
b43df36e85
[fixes] return debtors account name
2016-03-18 15:05:50 +05:30
90ff509f6d
[fix]Earlier recurring billing
2016-03-17 17:30:53 +05:30
d61b21cedf
Merge pull request #5002 from rohitwaghchaure/support_week_14_03_5
2016-03-18 10:33:18 +05:30
5b9d517d04
[fix]Fiscal year removed from trends report
2016-03-17 22:46:09 +05:30
84806bf673
Merge branch 'develop'
2016-03-17 19:31:45 +05:30
eba2c4323e
bumped to version 6.27.0
2016-03-17 20:01:45 +06:00
1ecd8cdaa3
[change-log]
2016-03-17 19:26:12 +05:30
21ade4a773
Merge pull request #5000 from nabinhait/develop
2016-03-17 19:19:19 +05:30
24f1c50dca
Create sample Material Requests via setup wizard only if warehouse exists
2016-03-17 19:14:43 +05:30
4f01704234
[fix] Fetch shipping address only if field exists
2016-03-17 19:14:15 +05:30
547d223b28
Merge pull request #4979 from vjFaLk/leave-improvements
2016-03-17 19:06:06 +05:30
2e08e3e186
Merge pull request #4991 from neilLasrado/develop
2016-03-17 19:05:09 +05:30
4e78cee1c2
Merge pull request #4959 from ShashaQin/patch-37
2016-03-17 18:13:09 +05:30
2f7b210aac
Merge pull request #4995 from nabinhait/develop
2016-03-17 18:05:28 +05:30
rohitwaghchaure
Rushabh Mehta
Kanchan Chauhan
mbauskar
DrTrills
Anand Doshi
Umair Sayyed
Neil Trini Lasrado
Nabin Hait
Saurabh
Agus Syahputra