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
mbauskar
d44af40de8
bumped to version 8.9.2
2017-08-28 12:26:17 +06:00
Nabin Hait
2df0788c11
Validate for negative outstanding reference only if party is Customer or Supplier ( #10568 )
2017-08-28 11:23:33 +05:30
Vishal Dhayagude
914b8463b7
[UI Test] UI Test for Payment Request Added: ( #10553 )
2017-08-28 11:14:28 +05:30
Utkarsh Goswami
7ba2a83182
Tests for Loan ( #10557 )
2017-08-28 11:13:16 +05:30
Vishal Dhayagude
554cf9be44
[UI Test] UI Test Added for Bank Reconciliation ( #10563 )
2017-08-28 11:11:36 +05:30
Vishal Dhayagude
da2164373c
[UI Test] UI Test added for Batch ( #10564 )
2017-08-28 11:10:26 +05:30
Vishal Dhayagude
c3a2204653
[UI Test] UI Test for Sales Order Cancel, amend and save ( #10570 )
2017-08-28 11:09:35 +05:30
tunde
63c8cb2fd1
add due_date to Journal Entry Account doctype
2017-08-27 17:56:47 +01:00
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Revant Nandgaonkar
2558daf6b7
Allow search without keypress enter
2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0
[Fix] POS Scanner
...
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
tunde
6b2d9e4990
patch to add due date to GL Entries for Sales/Purchase invoice
2017-08-25 15:25:18 +01:00
Zarrar
7dc113e977
instructor-naming ( #10550 )
2017-08-25 17:48:36 +05:30
Utkarsh Goswami
579c8e68f9
Tests for Expense Claims [HR] ( #10514 )
2017-08-25 16:12:49 +05:30
Ashwini Save
e33a1e0515
Hide "Help Article" button for timeline Communication type "Comment". ( #10541 )
2017-08-25 12:44:33 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Utkarsh Goswami
9a04da27b0
Test for training ( #10545 )
2017-08-25 12:01:04 +05:30
Manas Solanki
8de7c0245c
Fixes in the naming series ( #10480 )
...
* rewrite the js
* fix the space issue in the naming series
2017-08-24 17:51:23 +05:30
Vishal Dhayagude
17b2720f5b
[UI Test] UI Test for Payment Entry ( #10521 )
2017-08-24 17:50:28 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
Zarrar
1010a2a2a4
Resolving some issues in school [ issue no:- #10464 ] ( #10529 )
...
* guardian_name issue fix
* guardian table issue resolved
* resolved fetching issue + unnecessary code removed
2017-08-24 16:22:06 +05:30
Utkarsh Goswami
3da5574d79
Test for appraisal ( #10525 )
2017-08-24 15:48:57 +05:30
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Rushabh Mehta
7e506af0b9
[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 ( #10538 )
2017-08-24 15:23:33 +05:30
tunde
f7e87e66ee
do correct gl entry for debit and credit notes
2017-08-23 22:36:25 +01:00
Rushabh Mehta
72fa958f2c
[layout] lead and opportunity ( #10487 )
2017-08-23 18:47:57 +05:30
Vishal Dhayagude
641d88fd6b
[UI Test] UI Test added for Journal Entry ( #10512 )
...
* [UI Test] UI Test added for Journal Entry
* [mod] Edited date in journal Entry
* [fix] Codacy fixed
2017-08-23 18:32:12 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Rushabh Mehta
4a546e6c18
[minor] delivery note standard filter
2017-08-23 16:16:43 +05:30
Makarand Bauskar
dd8c0febd5
[minor] changed the modified date for bom for rename_bom_update_tool patch ( #10509 )
2017-08-23 13:17:37 +05:30
Faris Ansari
26df5b8c00
Connect Numpad events with POSCart
2017-08-23 13:12:12 +05:30
mbauskar
06f5ae0e78
Merge branch 'master' into develop
2017-08-23 13:06:43 +05:30
mbauskar
918f029d98
bumped to version 8.9.1
2017-08-23 13:36:43 +06:00
Nabin Hait
cb40bd86f8
Supplier bill no in GST itemised purchase register ( #10513 )
2017-08-23 13:04:50 +05:30
Rohit Waghchaure
b73321c577
Item search refactor
2017-08-23 12:15:10 +05:30
Saurabh
b903c86076
Merge pull request #10506 from nabinhait/hotfix677
...
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902
Minor fix in itemised sales register
2017-08-23 09:44:33 +05:30
mbauskar
b69ec059fe
Merge branch 'master' into develop
2017-08-22 20:22:24 +05:30
mbauskar
d46a9572af
bumped to version 8.9.0
2017-08-22 20:52:24 +06:00
rohitwaghchaure
7379e4e5de
Merge pull request #10195 from nabinhait/auto_update_bom_cost
...
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 19:14:53 +05:30
Nabin Hait
bb326f2bbd
Chart of accounts for Taiwan ( #10435 )
2017-08-22 19:07:42 +05:30
Nabin Hait
34c218b2de
Minor improvements based on skip_transfer ( #10457 )
2017-08-22 19:07:16 +05:30
Nabin Hait
382f5eb1b1
Run sales/purchase register for one month by default ( #10493 )
2017-08-22 19:06:21 +05:30
tunde
d13fe18d30
Merge branch 'develop' into payment-terms
2017-08-22 14:18:11 +01:00
Doridel Cahanap
a6a93cbe06
[Fix] Request for Quotation Portal Title ( #10489 )
2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343
[UI Test] UI test for Sales Invoice with Payment Entry ( #10483 )
...
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593
Travis fix for purchase order receipt ( #10498 )
2017-08-22 17:39:06 +05:30
mbauskar
4396a0e9a8
Merge branch 'master' into staging
2017-08-22 15:42:10 +05:30
mbauskar
3b3ab4d574
Merge branch 'master' into develop
2017-08-22 15:42:10 +05:30
mbauskar
974cfd2895
bumped to version 8.8.6
2017-08-22 16:12:09 +06:00
rohitwaghchaure
187cea3602
[Fix] Accepting duplicate serial no is purchase receipt ( #10469 )
...
* [Fix] Accepting duplicate serial no is purchase receipt
* Fixed test cases
2017-08-22 15:38:32 +05:30
Nabin Hait
28d8557905
[fix] Taxes in itemised purchase register ( #10494 )
2017-08-22 15:30:45 +05:30
mbauskar
7716a08b5d
Merge branch 'master' into staging
2017-08-22 12:03:47 +05:30
mbauskar
7d9452f4e4
Merge branch 'master' into develop
2017-08-22 12:03:47 +05:30
mbauskar
4cbd43cb40
bumped to version 8.8.5
2017-08-22 12:33:46 +06:00
Makarand Bauskar
11224eaf06
[hotfix] fixes for TypeError: 'NoneType' object is not iterable ( #10484 )
2017-08-22 12:03:02 +05:30
rohitwaghchaure
02bad86037
Merge pull request #10473 from rohitwaghchaure/item_group_issue_in_pos
...
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-22 11:34:49 +05:30
Nabin Hait
6c6e45157b
Fixed test case for replace bom
2017-08-22 10:49:58 +05:30
Nabin Hait
52cc08dd2d
Test case added for replacing BOM
2017-08-22 10:49:57 +05:30
Nabin Hait
adbf8adfb9
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 10:49:57 +05:30
tunde
10fc880b06
Merge branch 'develop' into payment-terms
2017-08-21 18:27:46 +01:00
Makarand Bauskar
a591d1df5f
[minor] ingore user permission for old_parent fields ( #10471 )
2017-08-21 19:04:49 +05:30
Rohit Waghchaure
33326fe90e
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-21 16:30:21 +05:30
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
Ameya Shenoy
c87c1dbbbf
converted production tests to INR from USD ( #10472 )
2017-08-21 14:10:04 +05:30
Rushabh Mehta
575ab3ab70
[docs] for print style ( #10452 )
2017-08-21 12:24:28 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
mbauskar
ddb26d02e5
bumped to version 8.8.4
2017-08-21 09:27:32 +06:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Zarrar
196b491ac4
[ui test ] Travis failing fix ( #10468 )
...
* Value in assertion was wrong
* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
Nabin Hait
1f49f511aa
Tax rate in Itemised sales/purchase register and cleanups ( #10439 )
2017-08-21 08:05:12 +05:30
rohitwaghchaure
0d9ab86496
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa ( #10453 )
2017-08-21 07:52:49 +05:30
rohitwaghchaure
6b1624cfee
[Fix] Tax rule is not working for the parent customer groups ( #10458 )
2017-08-21 07:38:37 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Makarand Bauskar
80d06da978
[hotfix] fixed mysql syntax error in Student and Guardian Contact Details report ( #10450 )
2017-08-21 07:34:45 +05:30
tunde
fb144303f5
codacy and typo fixes
2017-08-20 17:23:55 +01:00
tunde
c7f46218d7
tests and test fixes
...
fixes test case:
make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month'
so that it doesn't conflict with payment term due date
fix test case:
create purchase invoice with new supplier with credit_days_based_on
"Fixed Days" as the default "Last Day of Month" does not apply when
using payment terms
2017-08-20 17:23:27 +01:00
tunde
be1b871c53
modify validation if doc has payment term schedule
2017-08-20 17:22:59 +01:00
tunde
4c5efa3dec
renames set_payment_schedule and removes it from validation
2017-08-20 17:22:06 +01:00
tunde
43870aa8db
moves set_payment_schedule and validate_payment_schedule to accounts_controller
2017-08-20 16:56:43 +01:00
tunde
20c041cea4
add Payment Term to Purchase Invoice
2017-08-20 16:52:05 +01:00
tunde
b76ab49ede
add Payment Term to Purchase Order
2017-08-20 16:52:05 +01:00
tunde
9df5e004cf
add Payment Terms to Sales Order
2017-08-20 16:52:05 +01:00
tunde
bc174d980c
add Payment Term to Quotation
2017-08-20 16:52:05 +01:00
Nabin Hait
9275969b51
Payment Terms: doctypes, schedule, payments and more
...
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months
fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
2017-08-20 16:51:29 +01:00
KanchanChauhan
dd351c585a
[Minor] Title added to rfq web view ( #10454 )
2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Vishal Dhayagude
592e8c2e77
[UI Test] UI Test added for Stock Reconciliation ( #10432 )
...
* [UI Test] UI Test added for Stock Reconciliation
* [fix] Codacy
2017-08-18 15:01:20 +05:30
Utkarsh Goswami
5a27aead06
Test for Process Payroll ( #10447 )
2017-08-18 13:12:53 +05:30
Rohit Waghchaure
f03a73466c
Added modal for multi mode payment, provision to add write off and change amount
2017-08-18 12:15:19 +05:30
Utkarsh Goswami
ca63cc6439
[UI Test Recruitment] To test Recruitment in HR module ( #10441 )
...
* Tests for Recruitment
* Codacy fix
2017-08-18 11:57:01 +05:30
Vishal Dhayagude
2890fa74a2
[UI Test] UI Test for Purchase Receipt Added ( #10434 )
2017-08-18 11:55:14 +05:30
Joel Mesmer
97c1bcf14f
improvement for self-postbacks
2017-08-17 22:20:18 +02:00
Zarrar
780f11ec16
path to test updated ( #10438 )
2017-08-17 18:36:33 +05:30
Makarand Bauskar
fe43ecb5ee
[hotfix] fixed type in gst_state_code_data.json file ( #10437 )
2017-08-17 17:34:25 +05:30
