Commit Graph

1218 Commits

Author SHA1 Message Date
Nabin Hait
c10e106f8f
Optimization related to large number of items (#13606) 2018-04-12 13:25:03 +05:30
rohitwaghchaure
85f63a3866 [Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392) 2018-03-27 11:31:44 +05:30
rohitwaghchaure
c9a1eb1081 [Fix] Not able to delete row in modal table (#13377) 2018-03-27 11:26:43 +05:30
Nabin Hait
363cedde76 Fixed minor issue 2018-03-14 13:32:14 +05:30
Shreya Shah
7acc8cb747 fix else condition (#13295) 2018-03-13 18:12:19 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI (#13290) 2018-03-13 15:46:59 +05:30
Shreya Shah
aadd30d194 fetch delivery date on add-row only if item_code exists (#13250) 2018-03-09 12:19:35 +05:30
Zarrar
2550180a05 remove updating territory for customers on change (#13162) 2018-03-05 12:32:41 +05:30
Manas Solanki
5fd7b3bb80 Fix status updater (#13033)
* fix the status updater for multiple sources

* patch for updating the status

* patch for updating the sales order item

* Update update_status_for_multiple_source_in_po.py
2018-03-05 11:28:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero (#13129)
* Don't overwrite start and end date comes from payroll entry

* Get valuation rate from historical SLE even if it is zero, if records exists

* Valid till should be autoset if not any default value

* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
Nabin Hait
3b43c0d160 Update territory and customer_group patch optimization (#13076)
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
2018-02-27 15:57:14 +05:30
Zarrar
96002c28bd optimize patch for faster execution (#13068) 2018-02-27 15:57:01 +05:30
Zarrar
91fc1a8fbe Update Territory & Customer Group across all transaction (#13004)
* added method for update query based on changes

* patch added

* updated function, moved util function
2018-02-27 15:56:38 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
Faris Ansari
5a91989665 Remove total_projected_qty (#12889) 2018-02-13 16:00:52 +05:30
saurabh-bhosale
ed35a296ab closes #12872 (#12888) 2018-02-13 14:40:59 +05:30
rohitwaghchaure
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO (#12702) 2018-01-30 12:11:22 +05:30
Saurabh
cadd31cb0c [Fix] Solves issue #12588 2018-01-24 16:38:22 +05:30
Faris Ansari
4d4ce3e5cf Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517) 2018-01-17 14:40:27 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale (#12514)
* GL Entry on asset sale

* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
rohitwaghchaure
3955fa5102 [Fix] Email addres unique key issue (#12450) 2018-01-11 18:21:02 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290)
* Companywise default tax template

* Fix test cases
2018-01-05 12:42:02 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +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
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
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
Nabin Hait
e761b9de40 Rearranged fields due to merge conflict messup 2017-11-30 14:29:10 +05:30
Shreya
c0c470b56d fixed json affected by latest merge 2017-11-29 19:31:15 +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
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
Nabin Hait
68768252ce Cleanup and fixes on bypass credit limit check on sales order 2017-11-23 17:48:59 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861 2017-11-23 16:12:55 +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
cc884578b5
Update sales_order.py 2017-11-21 12:24:03 +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
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