Commit Graph

9718 Commits

Author SHA1 Message Date
Nabin Hait
12ce3eefca landed cost voucher added in module page 2014-09-01 18:16:24 +05:30
Anand Doshi
f395b7ce11 [hotfix] item grid rate visibility booboo 2014-09-01 17:26:00 +05:30
Anand Doshi
4228adfaa7 Merge pull request #2109 from ankitjavalkarwork/recurringorder2
Commonified Recurring for Sales Invoice and Sales Order
2014-09-01 16:34:12 +05:30
Anand Doshi
8ad474b910 Merge pull request #2122 from neilLasrado/print-templates-fix
[Cosmetics] Print Templates Layout Improved
2014-09-01 16:33:34 +05:30
ankitjavalkarwork
737d8e4d9f fix minor issue and set default value send as pdf 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
aaac7c17b8 Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
28a975dd32 Add patch for field name change in SI, rename email template 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094 Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
ac085e0f59 Add manage_recurring_documents and path to hooks, fix minor issues 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3 Commonify Recurring Sales Order/Invoice 2014-09-01 16:20:59 +05:30
Rushabh Mehta
21b8d30c80 Merge pull request #2131 from anandpdoshi/anand-september-1
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:52:45 +05:30
Anand Doshi
24989b90ba Hide Rate, Amount in Item Grid template based on permlevel 2014-09-01 12:38:09 +05:30
Nabin Hait
4f1bccb53d Merge pull request #2129 from anandpdoshi/anand-september-1
[patch] Set company's country
2014-09-01 11:11:19 +05:30
Anand Doshi
98eacdb785 [patch] Set company's country 2014-09-01 10:23:47 +05:30
Neil Trini Lasrado
8331ec7482 [cosmetics] Cheque Print format 2 2014-08-29 20:27:45 +05:30
Neil Trini Lasrado
d43752fc4f [cosmetics] Cheque Print format 1 2014-08-29 16:43:48 +05:30
Neil Trini Lasrado
bd03c8b28a Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix 2014-08-29 16:42:44 +05:30
Anand Doshi
d490933fce Merge pull request #2125 from anandpdoshi/anand-august-29
[fix] Maintenance Schedule, Incoming Rate
2014-08-29 16:38:03 +05:30
Neil Trini Lasrado
f65817d4c2 [cosmetics] payment receipt Print format 1 2014-08-29 16:31:57 +05:30
Anand Doshi
40a8ae2907 [fix] get incoming rate 2014-08-29 16:28:31 +05:30
Anand Doshi
12b98027ee [fix] Maintenance Scheduler periodicity validation 2014-08-29 16:11:11 +05:30
Neil Trini Lasrado
45a0ea9628 Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix 2014-08-29 15:48:42 +05:30
Anand Doshi
98ff85dea1 Merge pull request #2108 from neilLasrado/fix-issue-448
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
0015157cba Merge pull request #2120 from nabinhait/hotfix
Fixes in BOM and maintenance schedule
2014-08-29 15:43:00 +05:30
Anand Doshi
f513531d3a Merge pull request #2114 from neilLasrado/credit-note-feature
[print-template] Credit Note Issue #31
2014-08-29 15:32:42 +05:30
Neil Trini Lasrado
4e16e9ed89 Refactored Credit Note Print Format 2014-08-29 13:20:58 +05:30
Anand Doshi
9f0ea97d85 [fix] get future vouchers query
[print-template] Credit Note Issue #31 2
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
7a435bb4f1 [print-template] Credit Note Issue #31 1 2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
014346acba [print-template] Credit Note 2014-08-29 12:50:28 +05:30
Anand Doshi
c90773cc85 Merge pull request #2115 from anandpdoshi/user-permission-doctypes
HR permissions, translations
2014-08-29 11:55:51 +05:30
Nabin Hait
0514e07ef4 minor fix 2014-08-29 11:50:59 +05:30
Nabin Hait
14b8af2e65 Rounding issue fixed for bom quantity 2014-08-29 11:50:58 +05:30
Nabin Hait
818bacae49 Minor fix in maintenance schedule 2014-08-29 11:50:58 +05:30
Anand Doshi
6ba2e3deef Merge pull request #2118 from anandpdoshi/anand-august-28
[fix] default quotation list filter
2014-08-29 11:25:21 +05:30
Anand Doshi
bb370f3b6a HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions 2014-08-29 11:19:10 +05:30
Anand Doshi
f680626f53 [minor] send translations in response 2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
83ca3e5563 [Cosmetics] Print Templates Layout Improved 2014-08-28 14:48:16 +05:30
Anand Doshi
37cb544839 [fix] default quotation list filter 2014-08-28 11:27:18 +05:30
Nabin Hait
ec8964dde5 Merge pull request #2117 from anandpdoshi/anand-august-27
[fix] get future vouchers query
2014-08-28 10:43:35 +05:30
Anand Doshi
913c51b1f8 [fix] get future vouchers query 2014-08-27 22:09:15 +05:30
Neil Trini Lasrado
cd1efb94ed Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448 2014-08-27 18:49:03 +05:30
Neil Trini Lasrado
d6d71e8078 [fix] issue 448 final 1 2014-08-27 18:48:57 +05:30
Pratik Vyas
4cb67339c5 Merge pull request #2112 from anandpdoshi/anand-august-27
Enqueue Newsletter sending in Longjob Queue
2014-08-27 15:14:26 +05:30
Neil Trini Lasrado
4b71fe6fc1 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448 2014-08-27 12:31:31 +05:30
Anand Doshi
46256cddd7 Enqueue Newsletter sending in Longjob Queue 2014-08-27 12:23:52 +05:30
Neil Trini Lasrado
ad24069cdc [fix] issue 448 final 2014-08-26 16:30:39 +05:30
Nabin Hait
3b1733bc04 minor fix in sales invoice test records 2014-08-26 16:30:39 +05:30
Anand Doshi
43f087c99d [hotfix] Supplier read permission for Purchase User
[Fix] Issue #448

[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Nabin Hait
54ca95bc6e Merge pull request #2110 from nabinhait/hotfix
minor fix in sales invoice test records
2014-08-26 16:21:32 +05:30
Nabin Hait
e3f2323e14 minor fix in sales invoice test records 2014-08-26 16:20:38 +05:30