Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
Saurabh
0b9129e519
Merge branch 'hotfix'
2018-07-06 13:02:58 +05:30
Saurabh
778e06d0ee
bumped to version 10.1.41
2018-07-06 13:32:57 +06:00
rohitwaghchaure
3f5e80ebe3
Allow bulk edit for the sales invoice item ( #14826 )
2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
rohitwaghchaure
ea943c6fe4
[Fix] Due date validate issue in the POS ( #14825 )
2018-07-06 12:28:58 +05:30
Ranjith Kurungadam
5d134e0465
TDS Calculate tax for whole period on deduct checkboxes ( #14824 )
...
* Tax Exemption Proof Submission - fields submission_date, exemption_amount
* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary
* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
2018-07-06 11:57:32 +05:30
rohitwaghchaure
839320dca5
[Fix] Original Invoice outstanding is not updating after making Debit Note ( #14821 )
2018-07-06 10:42:15 +05:30
Andrew McLeod
686284261d
Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. ( #14811 )
2018-07-06 10:41:37 +05:30
rohitwaghchaure
82a9fde921
Added compact print option for the material request ( #14799 )
2018-07-06 10:40:51 +05:30
bobzz-zone
58236ffc1e
Update budget_variance_report.py ( #14798 )
...
Make sure GL Entry only called once in each row
2018-07-06 10:39:00 +05:30
Saurabh
b35721029b
Merge pull request #14820 from saurabh6790/fix_task_status
...
[fix] Add Overdue status in Project Task
2018-07-06 05:54:47 +05:30
Saurabh
f403031449
[fix] Add Overdue status in Project Task
2018-07-05 19:38:59 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes ( #14787 )
...
* [cleanup] add dashboard to leave policy, employee form cleanup
* [test] first_name in employee
* [fix] tests
* [fix] tests
* [fix] tests
* [hr] add more dashboards
* [minor] fixes + ux
2018-07-05 15:19:28 +05:30
Rushabh Mehta
c1b430c8bd
[enhance] added priority to issue ( #14815 )
2018-07-05 11:38:02 +05:30
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