Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,811 Commits 3 Branches 0 Tags 1 GiB
225ac0dac3
Commit Graph

12076 Commits

Author SHA1 Message Date
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
7faac85fff Merge branch 'master' into staging 2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec Merge branch 'master' into develop 2017-09-04 14:50:31 +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
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
Rohit Waghchaure
6ab630371d Fixed serial no trigger not working from dialog box 2017-09-01 17:02:42 +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
tunde
e44ce5d88e adjustment: removes credit_days_based on and credit_days fields 2017-08-31 16:11:42 +01:00
tunde
657ecd5227 adjustment: removes credit_based_on field 2017-08-31 16:06:56 +01:00
Nabin Hait
a9c9b69c22 Change actual charges based on exchange rate (#10619) 
* Change actual charges based on exchange rate

* Update transaction.js
 2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244 [Translation] Updated Translations (#10628) 2017-08-31 19:38:41 +05:30
tunde
229b583715 disable due date field if form has payment schedule data 2017-08-31 14:30:53 +01:00
Rohit Waghchaure
3e43927767 Test cases 2017-08-31 18:21:27 +05:30
tunde
50ec45d3b6 Merge branch 'develop' into payment-terms 2017-08-31 13:46:02 +01:00
tunde
400d046653 set payment terms template in get_party_details 2017-08-31 13:44:57 +01:00
Saurabh
60739847ab [minor][fix] change price field type from float to currency (#10626) 2017-08-31 17:08:30 +05:30
tunde
762c810fa2 add payment terms to supplier master 2017-08-31 11:52:49 +01:00
tunde
2775175b17 add payment terms to customer master 2017-08-31 11:52:14 +01:00
mbauskar
9012a9b414 Merge branch 'master' into staging 2017-08-31 15:31:48 +05:30
mbauskar
2965f92be3 Merge branch 'master' into develop 2017-08-31 15:31:47 +05:30
mbauskar
2a4328b4f5 bumped to version 8.10.1 2017-08-31 16:01:47 +06:00
Nabin Hait
d7ff9dca1d Fixed rounding issue in Process Payroll, fixes #9300 (#10586) 2017-08-31 15:17:01 +05:30
Nabin Hait
e7e29b7f10 GST print format for POS (#10590) 
* Serial no added in GST tax invoice

* GST print format for POS
 2017-08-31 15:06:12 +05:30
Umair Sayed
84be137b4e Migrating Help Articles (Q&A format) into User Manual (#10608) 
* adding articles in the manual

* adding articles in the manual 2

* migrating help articles to manuals
 2017-08-31 14:53:47 +05:30
Vishal Dhayagude
1252c30edf [UI Test] UI test for Repack and Sales Invoice with Serialize item Added (#10583) 
* [UI Test] UI test for Repack and Sales Invoice with Serialize item Added

* [Fix] Fixed path for sales invoice"
 2017-08-31 14:47:56 +05:30
Vishal Dhayagude
1458d7fea6 [UI Test] Stock Entry for material issue with serialize item (#10592) 2017-08-31 14:47:01 +05:30
tundebabzy
7f8a259beb Fixer Always Fetches Latest Exchange Rate Even When Date is Specified (#10596) (#10597) 
* test that confirms the bug. Same test should pass after fix

* make use of correct api url
 2017-08-31 14:30:15 +05:30
rohitwaghchaure
56e31d05e9 [Fix] POS customer field is hang while searching customer, make error log if sync has failed (#10607) 2017-08-31 14:19:58 +05:30
krnkris
3c635e219e Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json (#10601) 2017-08-31 14:17:46 +05:30
tunde
3dfbd957b7 add payment terms to supplier master 2017-08-31 09:42:01 +01:00
tunde
226164d81c add payment terms in customer master 2017-08-31 09:41:25 +01:00
Makarand Bauskar
de278635a3 [hotfix] fixes for UnicodeDecodeError (#10620) 2017-08-31 13:36:56 +05:30
tunde
e5460ab1df rename patch 2017-08-30 22:37:14 +01:00
tunde
6de18ce589 codacy fixes 2017-08-30 21:20:41 +01:00
tunde
93c015a42b add due_date in GL Entry from Journal Entry 2017-08-30 21:05:38 +01:00
tunde
501ef8733b fix due_date autopopulate commit 2017-08-30 21:02:20 +01:00
Rohit Waghchaure
7e752c4ebf Added patch, fixed codacy issue 2017-08-31 00:31:35 +05:30
tunde
4e490ad718 Merge branch 'develop' into payment-terms 2017-08-30 14:11:40 +01:00
tunde
08d8ca0184 enhance reference_due_date behaviour: 
- creates new api - get_invoice_due_dates
- when reference_name is changed, populate reference_due_date
 2017-08-30 13:55:32 +01:00
tunde
2883662ccb change due_date to reference_due_date in Journal Entry Account 2017-08-30 08:45:28 +01:00
Faris Ansari
6163a397df Disable eslint in lib 2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee Grand Total Value width 2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198 Merge branch 'develop' into pos-refactor 2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec Merge branch 'master' into hotfix 2017-08-29 20:42:06 +05:30
mbauskar
a896e52489 resolved merge conflicts 2017-08-29 20:41:59 +05:30
mbauskar
c0f34f454b bumped to version 8.10.0 2017-08-29 21:08:21 +06:00
tunde
a19ea6e2f3 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms 2017-08-29 15:26:50 +01:00
Rohit Waghchaure
70aaff46be minor fix in item group search 2017-08-29 19:19:58 +05:30
tundebabzy
1a947dbf6a Item Name not loaded in Material Request via BOM (#10535) (#10555) 
* adds item_name to child table

* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table

* removes empty first row after getting from BOM

* ui test
 2017-08-29 18:18:27 +05:30
tunde
7555a4a13e fix patch and also patch payment entries 2017-08-29 13:40:16 +01:00
Faris Ansari
c70bbacd34 Add online, offline option, fix search 2017-08-29 15:27:17 +05:30
tunde
3b327ed55f 'modify patch to also adjust journal entries' 2017-08-29 10:23:19 +01:00
Faris Ansari
655f86d5e2 UI fixes 2017-08-29 14:27:01 +05:30
Faris Ansari
b9939a6449 Merge pull request #10448 from joelios/selfpostback 
improvement for self-postbacks
 2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2 handle both cases 2017-08-29 14:02:49 +05:30
Rohit Waghchaure
ba3f0e6b70 Added serial no, batch no, item group functionality 2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1 Python 3 compatibility syntax error fixes (#10519) 
* Use Python 3 style print function

* Use 'Exception as e' instead of 'Exception, e'

* Unpack tuple arguments explicitly in instead of relying on auto unpacking

* Use consistent indentation

* Use 0 if stock_frozen_upto_days is None
 2017-08-28 18:17:36 +05:30
Faris Ansari
847f9f80c1 Merge pull request #10559 from mntechnique/pos_scanner_hotfix 
[Fix] POS Scanner
 2017-08-28 16:54:01 +05:30
Vishal Dhayagude
7ed4bfe7ee [UI Test] UI Test for Material Receipt with Serialize Item Added (#10565) 
* [UI Test] UI Test for Material Receipt with Serialize Item Added

* [fix]Codacy fixed
 2017-08-28 16:53:25 +05:30
Faris Ansari
8fbc08f91f Decrease timeout to 400 2017-08-28 16:52:20 +05:30
Vishal Dhayagude
872bebbbf8 [UI Test] Stock Entry for Subcontract (#10574) 2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996 [UI Test] Stock Entry for Material Transfer to Manufacture (#10572) 2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab resolved merged conflicts 2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2 resolved merged conflicts 2017-08-28 11:57:56 +05:30