tunde
e0cec4ef05
Merge branch 'payment-terms' of https://github.com/tundebabzy/erpnext into payment-terms
2017-09-05 17:37:35 +01:00
tunde
a496c43581
fix test
2017-09-05 17:36:21 +01:00
tundebabzy
dc64f70f07
Merge branch 'develop' into payment-terms
2017-09-05 11:14:47 +01:00
Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97
Company Dashboard Title Translatable ( #10673 )
2017-09-05 15:09:35 +05:30
Rohit Waghchaure
2967d7ed01
Merge branch 'bom_currency' into develop
2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76
update rate based on uom conversion factor
2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf
[Translation] Updated Translations ( #10669 )
2017-09-05 09:19:06 +05:30
tunde
7f9a462506
Merge branch 'develop' into payment-terms
2017-09-05 01:35:51 +01:00
tunde
743ba690dd
more test cases for Supplier
2017-09-05 01:17:14 +01:00
tunde
ed86efb1fd
modify get_due_date
to check Supplier Type if needed
2017-09-05 01:15:31 +01:00
tunde
b8ddae13ba
fix patches
2017-09-05 00:23:24 +01:00
tunde
2fdb857fed
fix due date disable bug
2017-09-05 00:21:54 +01:00
tunde
60aecd87b1
fix bugs in patches
2017-09-04 19:40:31 +01:00
tunde
4e4a40e46b
add new field payment_terms
to Supplier Type
2017-09-04 19:38:41 +01:00
tunde
635423d70f
rewrite Supplier test cases
2017-09-04 19:37:54 +01:00
tunde
57171cdc48
patch for credit days in Supplier Type
2017-09-04 19:33:35 +01:00
tunde
95b3d7c619
patch for payment term field in Supplier Type
2017-09-04 19:32:14 +01:00
tunde
4163c9529d
fix get_due_date
function to return date as string
2017-09-04 19:30:01 +01:00
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
tunde
c6d60e1de3
update patch list
2017-09-04 13:41:17 +01:00
tunde
bc9b5d699e
fix patch
2017-09-04 13:40:54 +01:00
tunde
76bba08e45
patch to create and set default payment term in customer/supplier
2017-09-04 13:37:32 +01:00
tunde
feffca2b05
patch to add payment_terms_field
2017-09-04 13:34:31 +01:00
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
mbauskar
10fdf5a8c3
Merge branch 'hotfix'
2017-09-04 14:50:30 +05:30
mbauskar
11cf44986b
bumped to version 8.10.2
2017-09-04 15:20:30 +06:00
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Makarand Bauskar
cf9e986f82
[hotfix] fixed the invalid variable name lead.name ( #10648 )
2017-09-04 10:25:37 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928
Help pages for Attendance ( #10634 )
...
* Help pages for Schools setup
* Documentation of Schools module
* Help pages for Student
* Help pages for Student
* Help pages for Schools Student and Admission Module
* Documentation for Schools Attendance
2017-09-04 10:17:18 +05:30
Saurabh
21833413b0
[fix] ERPNext signup link fix on demo page ( #10649 )
2017-09-04 10:15:24 +05:30
Francisco Roldán
11355cd3c9
Set at lost translated in quotation ( #10652 )
2017-09-04 10:14:58 +05:30
Nabin Hait
2b05e61d58
Merge branch 'rmehta-bcornwellmott-confirm_training' into develop
2017-09-04 10:13:47 +05:30
Nabin Hait
baacf51a00
Fixed merge conflict
2017-09-04 10:13:29 +05:30
Zarrar
85eeafdccc
added filter for grading scale selection ( #10639 )
2017-09-01 21:45:10 +05:30
Makarand Bauskar
d6922b2de3
[hotfix] lead name should available before creating new customer from quotations ( #10642 )
2017-09-01 18:45:40 +05:30
tunde
975eff7310
remove redundant test case
2017-09-01 12:10:44 +01:00
Umair Sayed
f1881065a8
Merging Help Articles (Q & A) into Manual (Part 2) ( #10629 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
tunde
cbd72f6113
adjust failing tests
2017-09-01 11:48:00 +01:00
tunde
7b7dcddf86
modify get_due_date
call from sales/purchase invoice
2017-09-01 11:36:08 +01:00
tunde
b3a6338c79
patch replace credit_days with payment terms schedule
2017-09-01 11:35:22 +01:00
tunde
f0e9dd2597
patch to add due_date to GL Entry table
2017-09-01 11:34:26 +01:00
Rushabh Mehta
fc1c00716c
[test] test_account.js - more timeout?
2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00
[test] test_account.js
2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6
[test] test_account.js
2017-09-01 11:46:11 +05:30
tunde
1c2edaebc4
patch customer records
...
- creates payment term and payment term template based on credit_days setting
- sets payment term template for records that had credit_days
2017-08-31 22:52:06 +01:00
tunde
8935f6546c
removes get_credit_days
function as it is no longer useful
2017-08-31 16:31:15 +01:00
tunde
3b4bd3791d
adjust get_due_date
to calculate based on payment term template
2017-08-31 16:28:47 +01:00