tunde
0d82b6979e
add missing field and value parameters
2017-11-28 23:30:03 +01:00
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
rohitwaghchaure
a14baf4188
Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case
...
[fix] payment terms test case
2017-11-27 12:05:57 +05:30
Charles-Henri Decultot
22641e44ad
Allowing the creation of an Oganization as Lead ( #11724 )
...
* Allow the creation of an organization lead
* Changes following test fails
* Test case correction
2017-11-27 11:58:22 +05:30
Rohit Waghchaure
52bf56d415
[fix] payment terms test case
2017-11-27 11:43:52 +05:30
rohitwaghchaure
15f8fe0179
[fix] Batch selected in the sales transaction for non batch item ( #11713 )
2017-11-24 10:46:27 +05:30
Nabin Hait
aa5b566ea9
Merge branch 'ashish-greycube-feature_10861-1' into develop
2017-11-23 17:49:25 +05:30
Nabin Hait
68768252ce
Cleanup and fixes on bypass credit limit check on sales order
2017-11-23 17:48:59 +05:30
Rohit Waghchaure
09b39f06ea
Code cleanup
2017-11-23 16:30:10 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861
2017-11-23 16:12:55 +05:30
tundebabzy
acccdb3890
Default batch number selection ( #11454 )
...
* fetch batch_no in `get_basic_details`
* PEP8 changes and docstring
* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch
* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out
* fetch batch number in `get_basic_details` using FEFO
* add new function - `set_batch_number`
* `set_batch_number` when `qty` is triggered
* `set_batch_number` when `uom` is triggered
* whitelist `get_batch_no_fefo`
* code clean up
* move `set_batch_number` to conversion_factor instead of uom
* rename `get_batch_no_fefo` to `get_batch_no`
* fix test case
* final cleanup
* Revert "fetch batch_no in `get_basic_details`"
This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3.
* fix test case
* update Sales Invoice manual
* move changes away from `transaction.js`
* query should not fetch expired batches
* refactor `get_batch_no`:
add new function `get_batches`
* Update batch.py
2017-11-23 13:05:15 +05:30
Nabin Hait
82027ea3bf
Set print hide property for payment terms
2017-11-23 12:49:42 +05:30
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +05:30
Nabin Hait
cc884578b5
Update sales_order.py
2017-11-21 12:24:03 +05:30
rohitwaghchaure
834541a7e8
[fix] Added primary action in the modal which will show on the submission in the pos ( #11575 )
2017-11-20 11:31:53 +05:30
Rohit Waghchaure
77940493a8
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 19:06:31 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104
[fix] merge-conflicts
2017-11-17 14:03:13 +05:30
Rohit Waghchaure
44f7b157ff
[fix] POS redirect issue
2017-11-17 13:52:11 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
ashish
f17ca7866a
removed names from comments
2017-11-16 11:08:14 +05:30
ashish
604eb9d689
added flag to function get_customer_outstanding and removed names in comments
2017-11-16 11:05:59 +05:30
ashish
a20c8dbd5c
instead of caller as 3rd arg added a flag
2017-11-16 11:03:39 +05:30
ashish
a1feb32891
added json for bypass credit limit checkbox
2017-11-16 11:01:43 +05:30
ashish
62155fa0e5
Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861
2017-11-16 10:47:44 +05:30
Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
10823e5a25
Merge branch 'neilLasrado-develop1' into develop
2017-11-14 17:40:45 +05:30
Nabin Hait
b55e98570f
Minor fixes
2017-11-14 17:40:30 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
Nabin Hait
cd13a28417
Get items from quotation in sales invoice
2017-11-14 17:13:53 +05:30
AravindPranera
86e726158b
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
Saurabh
a5275a1ba9
Merge branch 'master' into develop
2017-11-10 15:53:44 +05:30
Rohit Waghchaure
a5e3c3a79f
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:29:26 +05:30
Pawan Mehta
1368ba00bc
[fix] #11337 ( #11339 )
2017-11-10 14:59:26 +05:30
Nabin Hait
ff73646212
Made POS Profile mandatory and changed test order
2017-11-08 14:34:38 +05:30
Saurabh
98aa544f25
Merge branch 'master' into staging
2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Sushant Nadkar
72c40f0383
Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note ( #11440 )
2017-11-08 11:35:46 +05:30
Rohit Waghchaure
57cc924d29
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-06 18:42:37 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
...
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
Faris Ansari
cbaa0e629c
fix codacy
2017-11-03 11:35:49 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
Saurabh
3be72ef187
Merge branch 'master' into develop
2017-11-02 12:14:41 +05:30
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Rohit Waghchaure
5ec9f6930b
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-10-31 15:26:56 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
ashish
b883e4ee0d
customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added.
2017-10-26 20:32:08 +05:30
ashish
751b05f1e8
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added.
2017-10-26 20:15:24 +05:30
ashish
9dfc0f32ab
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate.
...
test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.
2017-10-26 20:07:32 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Nabin Hait
c799a22d55
Merge branch 'master' into staging
2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9
Merge branch 'master' into develop
2017-10-26 14:35:34 +05:30
Faris Ansari
6887cedaea
[fix] item qty trigger ( #11349 )
2017-10-26 14:34:15 +05:30
Saurabh
b445633e56
Merge branch 'master' into staging
2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d
Merge branch 'master' into develop
2017-10-26 09:59:22 +05:30
rohitwaghchaure
c65f1d7745
Search item using name instead of item code ( #11327 )
2017-10-25 17:04:56 +05:30
ashish
8fbf10f5db
New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level
2017-10-25 16:20:50 +05:30
ashish
fb364df091
customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set
2017-10-25 16:17:55 +05:30
ashish
8ad4efee25
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice
2017-10-25 16:07:21 +05:30
ashish
06e6a82d56
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified
2017-10-25 15:56:39 +05:30
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
Nabin Hait
cd3dbcb2ef
Fixed Merge Conflict
2017-10-25 14:07:25 +05:30
rohitwaghchaure
4a60554b91
Green indicator in the cart for non stock item ( #11325 )
2017-10-25 13:59:29 +05:30
tundebabzy
bafcd7418a
Add Bundle Description Field To Product Bundle ( #11122 )
...
* add description field that shows in list view
* description field should be simply `description`
2017-10-25 12:22:08 +05:30
Nabin Hait
1c1237537b
Subscription fixes ( #11292 )
...
* Subscription fixes
* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Neil Trini Lasrado
eb662b5a9a
Added Test Cases
2017-10-18 18:16:47 +05:30
Neil Lasrado
af091ac5dd
[BUG] Map Production Order with the exact Sales Order line item
2017-10-18 18:16:46 +05:30
Neil Lasrado
5afc194742
[BUG] Fixes make Production Order from Sales Order
2017-10-18 18:16:46 +05:30
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
mbauskar
cd4202c2f7
Merge branch 'master' into develop
2017-10-15 19:10:56 +05:30
rohitwaghchaure
8bf7230fcc
[Fix] New invoice showing old paid amount if POS Profile is not created ( #11160 )
2017-10-15 19:09:14 +05:30
Saurabh
5ffed60916
Merge branch 'master' into develop
2017-10-11 14:39:11 +05:30
rohitwaghchaure
76a9cefc9c
Merge pull request #11151 from rohitwaghchaure/minor_fix_title
...
[minor] Title not showing in payment modal
2017-10-11 12:05:29 +05:30
Rohit Waghchaure
4f7873b9df
[minor] Title not showing in payment modal
2017-10-11 12:03:49 +05:30
Saurabh
ad9afe68f3
Merge pull request #11119 from rohitwaghchaure/default_company_pos
...
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-11 12:00:56 +05:30
Rohit Waghchaure
3f309e1c20
Multiple items showing for single barcode
2017-10-11 02:14:56 +05:30
Rohit Waghchaure
9bb81ee1cb
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
2017-10-11 01:54:36 +05:30
tunde
37c2b6116c
Merge branch 'develop' into payment-terms
2017-10-09 15:42:47 +01:00
mbauskar
966b3c156a
[conflicts] resolved merge conflicts
2017-10-09 15:20:30 +05:30
Rohit Waghchaure
d270748eea
[Fix] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-09 12:54:26 +05:30
Rohit Waghchaure
62ce218fc2
Show total instead of net total
2017-10-06 11:16:46 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
Nabin Hait
5a834209d0
Cleanup of PO schedule date pull requests
2017-10-05 19:51:10 +05:30
rohitwaghchaure
e0dfd1608e
[Fix] Auto add item in the cart if sinfle items found in the serach ( #11072 )
2017-10-05 18:30:51 +05:30
Nabin Hait
395cf4689b
Cleanup of schedule date functionality in Material Request
2017-10-05 18:27:37 +05:30
rohitwaghchaure
607b5d4985
[Fix] Negative qty issue in POS ( #11070 )
...
* [Fix] Negative qty issue in POS
* Update point_of_sale.js
2017-10-05 15:57:58 +05:30
Rohit Waghchaure
f7a856b913
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
2017-10-05 13:31:29 +05:30
Nabin Hait
b779644493
Merge branch 'master' into develop
2017-10-04 14:52:32 +05:30
rohitwaghchaure
5049edb494
[Fix] Discount and serial no search issue ( #11040 )
2017-10-04 14:33:12 +05:30
Saurabh
ee4a2dd26f
[fix] resolved merge conflicts
2017-10-03 18:02:09 +05:30
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Nabin Hait
7b6eaee05b
Fixes to handle async events ( #11018 )
...
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
2017-10-03 01:09:46 +05:30
Rohit Waghchaure
c4e52e5f95
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 21:20:54 +05:30
Nabin Hait
7eba1a35d3
Controller init args fix ( #11015 )
...
* Controller init args fix
* cleanup useless code
2017-10-02 15:59:27 +05:30
