Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,841 Commits 3 Branches 0 Tags 1 GiB
fbc3d25d13
Commit Graph

688 Commits

Author SHA1 Message Date
Nabin Hait
fbc3d25d13 Root type defined for uae and austria 2014-10-06 13:01:58 +05:30
Nabin Hait
9ddc002d6a country wise chart of accounts restructured 2014-10-06 13:01:58 +05:30
Nabin Hait
712aa5809d Minor changes in import-from-odoo 2014-10-06 13:01:57 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
ankitjavalkarwork
44d42ddf63 [fix] Merge permission roles to modify frozen entries/set frozen accounts 2014-09-30 10:40:39 +05:30
Nabin Hait
b9e04815f8 Repost gl entries for future stock vouchers 2014-09-26 14:24:42 +05:30
Anand Doshi
32a9dfd983 Merge branch 'sbkolate-develop' into develop 2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343 Fixes for recurring document 2014-09-21 19:45:49 +05:30
Nabin Hait
48f5fa69f3 Fetch and validate advance entries in sales/purchase invoice 2014-09-18 15:04:11 +05:30
Anand Doshi
8370cb3e71 Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop 2014-09-18 12:06:05 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Anand Doshi
93c2adb2cd Merge pull request #2193 from anandpdoshi/anand-september-15 
Recurring fix, cherry-picked nabin's address template fix
 2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925 fix build 2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd Merge pull request #2173 from ankitjavalkarwork/fix2043 
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
 2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578 fix conflict 2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432 fix conflict 2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b fix conflict 2014-09-15 12:20:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b [minor] ui/ux fixes in Payment Tool 2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
ankitjavalkarwork
3df10429db Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form 2014-09-11 16:58:18 +05:30
Sambhaji Kolate
b14401c320 change convert_to_recurring() to take recurring_id dynamicaly 2014-09-11 16:09:05 +05:30
Sambhaji Kolate
b2a3f2d386 some minor changes get fixed for PO/PI 2014-09-10 17:40:48 +05:30
Sambhaji Kolate
6b679c45df Updated purchase_invoice.json and purchase_order.json with some missed out changes 2014-09-10 13:57:45 +05:30
Sambhaji Kolate
e3d2643f2b Changes for Recurring PO/PI 2014-09-10 13:07:59 +05:30
Anand Doshi
fc33d5a75b Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810 2014-09-09 15:25:43 +05:30
Anand Doshi
45c9b1c065 [minor] Set in_list_view for Sales and Purchase item tables 2014-09-08 17:42:17 +05:30
Nabin Hait
91fb661d12 minor fixes 2014-09-05 14:56:24 +05:30
Nabin Hait
84f0cc6614 Dont show opening entries in Bank reconciliation 2014-09-04 15:21:46 +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
Anand Doshi
98ff85dea1 Merge pull request #2108 from neilLasrado/fix-issue-448 
[Fix] Issue #448
 2014-08-29 15:46:13 +05:30
Neil Trini Lasrado
4e16e9ed89 Refactored Credit Note Print Format 2014-08-29 13:20:58 +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
e3f2323e14 minor fix in sales invoice test records 2014-08-26 16:20:38 +05:30
Neil Trini Lasrado
9d1e8b61fe [Fix] Issue #980 final 2014-08-25 19:04:30 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Anand Doshi
bb6b58c271 Merge pull request #2074 from neilLasrado/purchase-invoice-fix 
[fix] frappe/erpnext#1510
 2014-08-25 12:51:16 +05:30
Nabin Hait
79f91109cd Update pricing_rule.py 2014-08-21 19:21:25 +05:30
Nabin Hait
16aba71da0 Escaped item group value in pricing rule condition 2014-08-21 19:02:02 +05:30
Nabin Hait
8058832a48 Fixex in payment reconciliation 2014-08-21 18:06:35 +05:30
Neil Trini Lasrado
bf4ceb981f Merge https://github.com/frappe/erpnext into purchase-invoice-fix 2014-08-20 14:39:22 +05:30
Neil Trini Lasrado
84e5a4a2c2 [fix-remarks-changed-issue#110] 2014-08-20 13:44:56 +05:30
Anand Doshi
cca6460e65 [fix] Error Reports 2014-08-19 16:06:09 +05:30
Nabin Hait
0a35effe49 Precision issue in tax calculation 2014-08-19 13:22:19 +05:30