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

21660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zarrar
6578bc11b6 wrong query formed to delete events (#13119) 2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM (#13112) 
* Create user from Employee

* Set auto created serial nos in incoming transactions in case of multi uom
 2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5 Make Expense Claim from Employee Advance #13053 (#13074) 
* allow to make expense claim from employee advance

* make expense claim only if claimed amount < paid_amount

* expense claim made from employee advance is paid
 2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67 display image fnd description for root BOM also (#13099) 2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8 Do not validate payment schedule for POS (#13115) 2018-03-01 10:32: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
rohitwaghchaure
332a17ee86 [Fix] Test case for serial no (#13136) 2018-03-01 10:28:04 +05:30
Achilles Rasquinha
45522327b9
Merge pull request #13137 from achillesrasquinha/py3 
Fix unittest
 2018-02-28 22:01:35 +05:30
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
Shreya Shah
a310cc7156 order by modified instead of item name (#13113) 2018-02-28 18:59:55 +05:30
Ameya Shenoy
c20901443e updated develop_version to 11 (#13133) 2018-02-28 17:38:23 +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
Faris Ansari
72d8509b3d
python 3 fix (#13127) 2018-02-28 12:53:34 +05:30
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3 
[FIX] sorting multiple compares
 2018-02-27 19:48:25 +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
Ameya Shenoy
3ee22f0137 rename valid_email to validate_email (#13103) 2018-02-27 12:59:12 +05:30
rohitwaghchaure
f1755fb5b1
Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1 
[Hotfix] POS discount issue
 2018-02-27 11:58:33 +05:30
Manas Solanki
be841ccc53
Merge pull request #13096 from manassolanki/fix-fee-schedule 
Fixes in the Fees Schedule
 2018-02-27 11:23:38 +05:30
Frappe PR Bot
c6e2d750bb [Translation] Updated Translations (#13097) 2018-02-27 11:00:59 +05:30
Zarrar
033eb779d4 minor fixes for member (#13101) 2018-02-27 11:00:47 +05:30
Manas Solanki
51dfba749b filter students on basis of category and button to show fees 2018-02-26 19:32:26 +05:30
Nabin Hait
3799f8bec9 Don't validate serial nos while cancelling the transaction 2018-02-26 16:39:06 +05:30
Zarrar
e53a238665 minor fix (#13095) 2018-02-26 15:59:20 +05:30
Shreya Shah
70a57e08fd New Report Employee Advance Summary (#13040) 
* New Report Employee Advance Summary

* JSON style column definition
 2018-02-26 15:58:57 +05:30
Rohit Waghchaure
3edc101957 [Fix] POS discount issue 2018-02-26 13:25:58 +05:30
Nabin Hait
127c61e930 Fixed logic in itemwise recommended reorder level 2018-02-26 12:43:17 +05:30
rohitwaghchaure
8ffd5d40e3 [Fix] UX for delivery trip (#13046) 
* [Fix] UX for delivery trip

* Fixed test cases
 2018-02-26 12:25:39 +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
e55831a89c Projected Qty in Auto reorder email 2018-02-26 11:38:40 +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
Achilles Rasquinha
a3555aa7bd [FIX] sorting multiple compares 2018-02-23 17:22:07 +05:30
Nabin Hait
802819df9d Merge branch 'master' into develop 2018-02-23 16:59:44 +05:30
Nabin Hait
4ff4d185f7 Merge branch 'hotfix' 2018-02-23 16:59:42 +05:30
Nabin Hait
d54953e419 bumped to version 10.1.4 2018-02-23 17:29:42 +06:00
Zarrar
339426c926 fix permission issue for stock balance report - Item Group (#13069) 2018-02-23 16:58:55 +05:30
Nabin Hait
7570774ebe Merge branch 'master' into develop 2018-02-23 16:49:43 +05:30
Nabin Hait
489ff6e21c Merge branch 'hotfix' 2018-02-23 16:49:41 +05:30
Nabin Hait
d12fb58c12 bumped to version 10.1.3 2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce verify payment entry amount is positive (#13066) 
* verify payment entry amount is positive

* Update sales_invoice.py

* Update sales_invoice.py
 2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb [Fix] Item wise sales register report (#13055) 2018-02-23 16:25:30 +05:30
Shreya Shah
70a68897cc auto name on the basis of naming series (#13056) 2018-02-23 16:24:59 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
Frappe PR Bot
239c121f7d [Translation] Updated Translations (#13059) 2018-02-23 16:23:00 +05:30
rohitwaghchaure
dd0fc1084e [Fix] PDC amount, PDC print layout issue (#13062) 2018-02-23 16:20:46 +05:30
Faris Ansari
97b212e348 Patch optimization (#13060) 
* Patch fixes

* fix codacy

* Update item_barcode_childtable_migrate.py
 2018-02-23 16:19:41 +05:30
Raghavendra Kamath
1a9388acbb Clean inline css found in chapter and grant for loops! (#13038) 
* Clean inline css found in chapter and grant for loops!

* Remove redundant css

* remove unwanted ide files and append gitignore

* remove unnecessary line from build.json

* restore import for variable.less

* remove kdev from gitignore
 2018-02-23 14:34:44 +05:30
Nabin Hait
d283ee73f3 Fetch timesheet based on project 2018-02-23 12:58:39 +05:30