Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,351 Commits 3 Branches 0 Tags 1 GiB
852bd76a58
Commit Graph

23351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rushabh Mehta
2a5dc911e6 [github] remove issue template 2018-07-05 10:47:59 +05:30
Rushabh Mehta
b9b2bc9ace
Update PULL_REQUEST_TEMPLATE.md 2018-07-05 10:45:48 +05:30
Zarrar
a3f6856d81 python 3 fix for sorted (#14814) 2018-07-05 10:37:39 +05:30
Nabin Hait
d4453aef68 Fixed permission issue 2018-07-04 16:38:10 +05:30
rohitwaghchaure
25f36489b3
Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online 
[Fix] POS Profile ignore pricing rule not working for online pos
 2018-07-04 16:26:48 +05:30
Rohit Waghchaure
5005e467a0 [Fix] POS Profile ignore pricing rule not working for online pos 2018-07-04 12:37:38 +05:30
Shreya Shah
430810f64c Fix typo (#14802) 2018-07-04 10:17:36 +05:30
Aditya Hase
69711d2df2 Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) (#14803) 
This should also fix #13909 as a side effect.
 2018-07-04 10:17:17 +05:30
Zarrar
68a148e293 half_day enable/disable check (#14795) 2018-07-03 17:00:38 +05:30
rohitwaghchaure
205eae322b [Fix] BOM replace timeout issue (#14782) 2018-07-03 15:06:38 +05:30
Nabin Hait
24ee7e5eb1 Patch fix 2018-07-03 13:15:47 +05:30
Nabin Hait
9911309631 Patch fixes 2018-07-03 13:06:49 +05:30
Nabin Hait
f4660d2479 Ignore calculating tds if amount/formula is mentioned in salary structure 2018-07-03 13:06:49 +05:30
Ameya Shenoy
935f4a474b Prevent creation of more than 500 item variants (#14790) 2018-07-03 10:48:59 +05:30
Zarrar
c1225a84cc fix css for coa dialog in setup wizard (#14793) 2018-07-03 10:35:31 +05:30
Britlog
4412f10918 Add missing fields in select, the same as in get_product_list_for_group (#14789) 2018-07-03 10:33:49 +05:30
Charles-Henri Decultot
6d97ab6f78 Make fields translatable (#14786) 2018-07-03 10:32:53 +05:30
Shreya Shah
aa62a62bb0 Add VAT related fields after printing settings fields (#14773) 2018-07-03 10:28:20 +05:30
Vishal Dhayagude
0e027a14a7 [minor] Link to Employee Separation template and Onbording template added in HR Module Page (#14748) 
* [minor] Link to Employee Separation template and Onbording template added in HR Module Page

* [minor] Employee templated added in Employee Life Cycle Section
 2018-07-03 10:20:02 +05:30
Shridhar Patil
4987c4ef53 on delete contact update issue (#14770) 
* on delete contact update isuue

remove contact from issue if the deleted contact exists

* moved issue update function to issue.py

* Update formatting and comment
 2018-07-03 10:10:04 +05:30
Suraj Shetty
27067b34e1 Rename (#14771) 
- Daily Work Summary Settings to Daily Work Summary Group
in hr.py
 2018-07-03 10:08:45 +05:30
Shreya Shah
93d60869ed Fix patch (#14769) 
Income account instead of expense account
 2018-07-03 10:07:32 +05:30
Ranjith Kurungadam
273e8e59ca fix Salary Component (#14783) 2018-07-03 10:05:01 +05:30
Pawan Mehta
e734b7c17b Add filters to show Draft salary slips in salary register (#14780) 
* [fix] #14778

* replace if-elif block with inline block
 2018-07-03 10:01:19 +05:30
Frappe PR Bot
1baa811a40 [Translation] Updated Translations (#14776) 2018-07-03 09:59:57 +05:30
rohitwaghchaure
afe764264d [Fix] Employee advance issues (#14750) 2018-07-01 16:48:00 +05:30
Charles-Henri Decultot
f02bef78f0 FEC report corrections (#14741) 
* Report corrections to match government requirements

* Untranslatable headers

* Remove unused onchange logic
 2018-07-01 16:46:48 +05:30
Zarrar
dfe897b888 [ Fix ] UOM Conversion fix (#14768) 
* increase precision for conversion value

* inverse the conversion data

* update uom data

* rectify conversion logic according to inversion of values

* rectify test case for uom conversion

* patch improv to correct conversion data
 2018-07-01 16:45:53 +05:30
Ranjith Kurungadam
4dc5721ba5 fix - Benefit Application query (#14767) 2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen
8662a4f677 POS - Translate some text & numpad (#14765) 
* make label & placeholder translatable

* numpad translatable

* Update point_of_sale.js

remove debugger
 2018-07-01 16:44:09 +05:30
Nabin Hait
e3daaa63f0
Payroll fixes (#14758) 
* Ignore calculating tds if amount/formula is mentioned in salary structure

* [fix] Paid amount in Journal Entry from Payroll Entry

* fix codacy
 2018-07-01 16:43:34 +05:30
Ranjith Kurungadam
b1a756cc9f HRA Indian regional - field basic in company, calc changes (#14757) 2018-07-01 16:42:38 +05:30
rohitwaghchaure
1501a6e58e [Fix] Data missing issue in stock ledger report (#14755) 2018-07-01 16:42:00 +05:30
rohitwaghchaure
01fe4a3726 [Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753) 2018-07-01 16:41:39 +05:30
Manas Solanki
644f404c1b
Merge pull request #14759 from ESS-LLP/fix_typo 
fix typo
 2018-06-29 23:50:39 +05:30
Ranjith
69b03a3b53 fix typo 2018-06-29 20:14:20 +05:30
rohitwaghchaure
c5183b7c2a
Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties 
[Fix] Patch
 2018-06-29 19:02:38 +05:30
Rohit Waghchaure
4178030c99 [Fix] Patch 2018-06-29 17:54:25 +05:30
Ranjith Kurungadam
fd7ef2e15c Salary Component - field display, value dependency (#14747) 2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5 Payroll Entry - make only one JE, separate JE for Flexi (#14752) 2018-06-29 16:48:49 +05:30
Nabin Hait
b192a4af77 reload doc in patch 2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540 Set user permissions for new departments based on company 2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d Set salary component properties in existing components and salary structures 2018-06-29 14:36:45 +05:30
Manas Solanki
f184e35a4a
Merge pull request #14746 from frappe/manassolanki-patch-1 
Update bom_stock_calculated.py
 2018-06-29 13:33:51 +05:30
Manas Solanki
ee32a78e9f
Update bom_stock_calculated.py 2018-06-29 13:33:32 +05:30
Nabin Hait
104f62090d Add filters for cost center in Budget Variance report 2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … (#14670) 
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
 2018-06-28 23:43:23 +05:30
Nabin Hait
d0c6184e24 minor patch fixes 2018-06-28 23:42:55 +05:30
rohitwaghchaure
191876f51b [Fix] Bank Account mandatory (#14734) 2018-06-28 23:28:58 +05:30
Ranjith Kurungadam
a10f118ddd Payroll Entry - Validate Attendance (#14738) 2018-06-28 23:28:07 +05:30