rohitwaghchaure
bc2c83ee3c
Companywise default tax template ( #12290 )
...
* Companywise default tax template
* Fix test cases
2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49
[minor] POS profile mandatory, to set as default ( #12307 )
2018-01-05 12:26:33 +05:30
Nabin Hait
92615901a7
Fixed merge conflict
2017-12-25 13:41:04 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms ( #12115 )
2017-12-20 12:24:59 +05:30
rohitwaghchaure
b725affe0c
[fix] Mobile no search issue in the pos ( #12090 )
2017-12-19 11:21:00 +05:30
rohitwaghchaure
e067beda49
[fix] Promise issue, in cart against item displaying zero values ( #12078 )
2017-12-18 12:32:49 +05:30
rohitwaghchaure
78a17355be
[fix] Item search in POS ( #12037 )
2017-12-15 15:38:12 +05:30
rohitwaghchaure
5a344576b8
[minor] Address fix ( #12025 )
2017-12-15 13:14:36 +05:30
Vishal Dhayagude
d377018695
[fix] Shipping charges change on qty, item_code and conversion_factor trigger ( #12001 )
...
* [wip] shipping rule
* [wip] Shipping Rule tax auto calculate
* [wip] Shipping Rule
* [new] Shipping charges change on different triggers
* [minor] Removed unnecessary comments
* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
rohitwaghchaure
2b95a5438b
POS batch fixes ( #12005 )
2017-12-14 16:06:23 +05:30
rohitwaghchaure
24e5265281
[enhance] Search customer using primary contact mobile number ( #11998 )
...
* [enhance] Search customer using primary contact mobile number
* Update build.json
2017-12-14 13:06:21 +05:30
Nabin Hait
0f97eda7c9
Merge branch 'master' into develop
2017-12-12 19:17:53 +05:30
Charles-Henri Decultot
d18423d9c7
Project Margin Calculation Improvement ( #11911 )
...
* Project Margin Calculation Improvement
* Documentation modification
* Change Total Planned Sales to Total Sales Amount
* Change documentation screenshot
2017-12-12 14:59:59 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes ( #11951 )
...
* Production Order from Sales Order fixes: Validate SO and set required items on save
* Codacy fixes
2017-12-12 13:22:48 +05:30
rohitwaghchaure
d19be49889
[fix] Error opening the POS ( #11929 )
2017-12-11 14:57:43 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
c47745ea83
only fetch distinct names of events ( #11846 )
2017-12-04 19:23:20 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Nabin Hait
e761b9de40
Rearranged fields due to merge conflict messup
2017-11-30 14:29:10 +05:30
tundebabzy
ce63ab7602
Show Batch Selector Dialog Only If There Are Multiple Batches ( #11794 )
...
* check if multiple batches available before showing dialog
* Update point_of_sale.js
2017-11-30 11:38:53 +05:30
tundebabzy
8ae53cacc5
When Warehouse Field Is Changed, Batch Number Field Should Be Updated ( #11789 ) ( #11790 )
...
* reset batch_no field if no batch number returned
* on warehouse change, query for batch number
2017-11-30 11:37:21 +05:30
Shreya
c0c470b56d
fixed json affected by latest merge
2017-11-29 19:31:15 +05:30
Rushabh Mehta
0154538c06
[fix] [minor] pos.js
2017-11-29 16:42:02 +05:30
rohitwaghchaure
1b344ca81e
[Fix] POS not loading if pos profile not defined ( #11778 )
2017-11-29 16:21:51 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
rohitwaghchaure
f591a220c9
Fetch items of item groups defined in the pos profile ( #11763 )
2017-11-29 13:55:13 +05:30
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
