Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,759 Commits 3 Branches 0 Tags 1 GiB
34dd079a68
Commit Graph

1655 Commits

Author SHA1 Message Date
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order (#12902) 
* remove occurrences of Production Order

* rename from report and jsons

* Change Production Order to Work Order

* change occurences of production order from other files

* resolve minor conflict issues and reports

* patch added

* codacy fix

* updated patches, leftover changes

* rename reports, rectify patches
 2018-03-20 12:38:43 +05:30
Mark Walker
f572522f25 Copy source project into Purchase Order Item (#13321) 2018-03-20 12:06:04 +05:30
Nabin Hait
bb5caf8fad Merge branch 'master' into develop 2018-03-14 13:33:38 +05:30
Nabin Hait
363cedde76 Fixed minor issue 2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5 Merge branch 'master' into develop 2018-03-13 18:13:44 +05:30
Shreya Shah
7acc8cb747 fix else condition (#13295) 2018-03-13 18:12:19 +05:30
Nabin Hait
3707242770 Fixed merge conflict 2018-03-13 16:15:41 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI (#13290) 2018-03-13 15:46:59 +05:30
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Suraj Shetty
f2d28ebd6a Data import Tool bug fix (#13165) 
* fixes #13064

* commonified naming series checks

* test fixes
replaced test employee names according to naming series
 2018-03-09 12:33:13 +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
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +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
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128) 
* Use range instead of xrange

* convert float to int
 2018-02-28 16:12:51 +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
Rohit Waghchaure
3edc101957 [Fix] POS discount issue 2018-02-26 13:25:58 +05:30
tundebabzy
9360f81b94 Validity of Quotation #12858 (#13078) 
* add new setting for default valid_till date

* codacy cleanup
 2018-02-26 12:23:41 +05:30
Nabin Hait
2572b05b35
Update territory and customer_group patch optimization (#13076) 
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
 2018-02-25 10:45:24 +05:30
Zarrar
4a0d27078e optimize patch for faster execution (#13068) 2018-02-23 17:41:32 +05:30
Nabin Hait
7570774ebe Merge branch 'master' into develop 2018-02-23 16:49:43 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Zarrar
79756c44c9 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-22 10:57:49 +05:30
Shreya Shah
8a77a0e1e4 Add total row in all trends reports (#13010) 
* total in sales order trends report

* total in all trends reports
 2018-02-21 14:46:07 +05:30
rohitwaghchaure
554f2de23d Code cleanup online POS (#12985) 2018-02-20 11:18:01 +05:30
Shreya Shah
5448318146 fix total field (#12992) 2018-02-19 12:44:52 +05:30
Achilles Rasquinha
0bf19a1ac5
Merge pull request #12931 from achillesrasquinha/py3-iteritems 
Py3 iteritems
 2018-02-15 13:49:43 +05:30
Achilles Rasquinha
1697a7aa81 replaced string_types with basestring 2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb Updated Python 3 fixes 2018-02-15 11:31:05 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
rohitwaghchaure
8e675ebbe2 [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) 2018-02-13 17:11:06 +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
saurabh-bhosale
99eb30242d [Fix] Bug fix in customer_primary_address frappe call (#12880) 2018-02-13 07:58:47 +05:30
Nabin Hait
662b23ce57 get address display in customer 2018-02-12 19:25:00 +05:30
Nabin Hait
4adcced9ae Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos 2018-02-12 19:14:38 +05:30
Nabin Hait
e21e59614f Fixed merge conflict 2018-02-12 15:59:55 +05:30
rohitwaghchaure
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829 2018-02-09 12:01:41 +05:30
Saurabh
0f3c4fa7a7 Codacy fix - used classmethod decorator 2018-02-09 11:30:11 +05:30
Saurabh
c29f3c70dc Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-09 10:51:49 +05:30
Saurabh
b4ab89e1da [Mod] Code refactored to remove dependency on 'complete_address' field 2018-02-09 10:49:30 +05:30
pawan
735b8c6094 [fix] #12829 2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30