Commit Graph

14588 Commits

Author SHA1 Message Date
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
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
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
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
Rushabh Mehta
df3bf5d76b Merge pull request #5020 from rohitwaghchaure/support_week_14_03_5
[formatting] Added between in trends.py
2016-03-21 15:42:34 +05:30
Rushabh Mehta
833432086b Merge pull request #5024 from nabinhait/recurring_doc_status
[patch] Fix delivery and billing status of recurring orders
2016-03-21 15:26:40 +05:30
Nabin Hait
2646f84a30 [patch] Fix delivery and billing status of recurring orders 2016-03-21 15:22:31 +05:30
Rushabh Mehta
7364f0cf1c [patch-fix] remove old patches for web-forms 2016-03-21 14:47:35 +05:30
Nabin Hait
443a7c13e4 [fix][balance sheet] Check if previous fiscal year is closed 2016-03-21 14:38:32 +05:30
Rushabh Mehta
a9ce706bfb [update] translations 2016-03-21 14:35:36 +05:30
Neil Trini Lasrado
11dafa27ba Added Project to materail request 2016-03-21 12:40:42 +05:30
Neil Trini Lasrado
c7f53ff318 Added Project filter to Production Planning Tool 2016-03-21 12:40:42 +05:30
rohitwaghchaure
49ccac5d95 [formatting] Added between in trends.py 2016-03-21 12:31:41 +05:30
Rushabh Mehta
98122a2574 Merge pull request #5013 from agusputra/patch-25
Update allow-over-delivery-billing-against-sales-order-upto-certain-l…
2016-03-21 12:22:01 +05:30
Rushabh Mehta
ea768ec132 Merge pull request #5019 from saurabh6790/supp1.0
[fixes] set todays date on employee attendance tool
2016-03-21 12:06:01 +05:30
Rushabh Mehta
d00ce6a8cf Merge pull request #5022 from nabinhait/recurring_fix3
[fix] set recurring id after saving
2016-03-21 12:04:56 +05:30
Nabin Hait
68a628ea1e [fix] set recurring id after saving 2016-03-21 12:03:30 +05:30
Saurabh
6a277e244c [fixes] set todays date on employee attendance tool 2016-03-20 19:00:26 +05:30
Agus Syahputra
383b13cdb5 Update allow-over-delivery-billing-against-sales-order-upto-certain-limit.md 2016-03-19 08:31:50 +07:00
Nabin Hait
f197d42503 Merge branch 'develop' 2016-03-18 16:36:40 +05:30
Nabin Hait
6d27470401 bumped to version 6.27.1 2016-03-18 17:06:40 +06:00