Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,158 Commits 3 Branches 0 Tags 1 GiB
43594b245c
Commit Graph

17158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
43594b245c changed version to beta 2016-12-15 19:37:53 +05:30
Nabin Hait
d25db23fdb [translations] 2016-12-15 18:33:39 +05:30
Nabin Hait
565844cfac Change log for v7.2.0 2016-12-15 17:49:31 +05:30
Nabin Hait
6eda07e445 Fixed merge conflict 2016-12-15 16:35:58 +05:30
Nabin Hait
b628971a80 Merge branch 'hotfix' 2016-12-15 16:35:32 +05:30
Nabin Hait
8a321406b2 bumped to version 7.1.26 2016-12-15 17:05:32 +06:00
Nabin Hait
f89c96c7a3 Merge branch 'standard_filters' into develop 2016-12-15 14:57:41 +05:30
Nabin Hait
f02f1bb0c7 Added standard filters 2016-12-15 14:57:20 +05:30
Nabin Hait
8c61f343b3 Validate negative stock on delivery while missing valuation rate for booking expenses 2016-12-15 13:46:03 +05:30
Nabin Hait
0c9c6c9608 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2016-12-15 11:52:59 +05:30
Nabin Hait
b08aaa5e20 Merge branch 'aruizramon-status-updates-crm' into develop 2016-12-15 11:52:18 +05:30
Nabin Hait
f49bbe1142 Cleanup of lead and opportunity status updating logic 2016-12-15 11:51:54 +05:30
Rushabh Mehta
01fab2ae1c [minor] fix salary slip test 2016-12-15 11:43:29 +05:30
Nabin Hait
6a1c0665bc Merge pull request #7227 from nabinhait/country_coa 
Chart of accounts for few countries, added test cases for each country
 2016-12-15 11:31:07 +05:30
Nabin Hait
a107302224 Merge pull request #7221 from bhupennewalkar1337/production 
Fix#7085 Issue Items Against Production Order
 2016-12-15 11:30:31 +05:30
Rushabh Mehta
e9d9b8e6f0 [fix] demo and process payroll for demo (#7224) 
* [fix] demo and process payroll for demo

* [fix] set payroll dates
 2016-12-15 11:27:35 +05:30
Nabin Hait
1ae8e2c8fa Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232) 2016-12-15 11:27:02 +05:30
Nabin Hait
e3edfe2b12 Removed quick entry for tax rule 2016-12-14 18:44:27 +05:30
Nabin Hait
a756d64fca Chart of accounts for some countries, added test cases for each country 2016-12-14 18:40:29 +05:30
Rushabh Mehta
9b049ee154 Revert "[Fixes]Payroll Fixes" (#7225) 2016-12-14 18:25:11 +05:30
bhupen
9e146669d3 Issue Items Against Production Order 2016-12-14 17:40:32 +05:30
Nabin Hait
42b6e37d15 Merge pull request #7216 from KanchanChauhan/salary-fixes 
[Fixes]Payroll Fixes
 2016-12-14 16:20:08 +05:30
Kanchan Chauhan
c292dd7213 [Fixes]Payroll Fixes 2016-12-14 15:50:54 +05:30
Nabin Hait
7ac0d294e1 Merge branch 'hotfix' 2016-12-14 14:33:06 +05:30
Nabin Hait
a9ecc0b700 Merge branch 'master' into develop 2016-12-14 14:33:06 +05:30
Nabin Hait
673d43cc8e bumped to version 7.1.25 2016-12-14 15:03:06 +06:00
Nabin Hait
450a94c6b4 Merge pull request #7214 from rohitwaghchaure/pricing_rule_issue_latest 
[Fix] Pricing rule issue
 2016-12-14 14:31:34 +05:30
Rohit Waghchaure
39712b5e1d [Fix] Pricing rule issue 2016-12-14 14:12:20 +05:30
Nabin Hait
cdb38de6af Merge pull request #7209 from bhupennewalkar1337/mendatory 
[Fix] No exception will be thrown when working hours field is kept blank in workstation #5166
 2016-12-14 13:03:17 +05:30
Nabin Hait
db4cfeed0e Merge pull request #7211 from frappe/shachiTakalkar-patch-1 
Update adding-margin.md
 2016-12-14 12:54:58 +05:30
Nabin Hait
a933713f9d Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev 
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
 2016-12-14 12:54:04 +05:30
Nabin Hait
aba470f1e6 Merge pull request #7206 from strixaluco/develop 
[docs] mention UID in LDAP instruction
 2016-12-14 12:53:33 +05:30
Nabin Hait
3a8ea2a3bb Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2 
[POS] Provision to delete the offline records
 2016-12-14 12:52:28 +05:30
Nabin Hait
36f5471bab Merge pull request #6855 from neilLasrado/training 
[new Feature] Added Training Module
 2016-12-14 12:51:51 +05:30
Nabin Hait
44cdbbe346 Merge pull request #7203 from KanchanChauhan/employee-permissions 
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
 2016-12-14 12:50:54 +05:30
Nabin Hait
4b5ab6a0d0 Merge pull request #7205 from nabinhait/hotfix 
Address naming if multiple address for same type
 2016-12-14 12:50:01 +05:30
Shachi Takalkar
41d4e33682 Update adding-margin.md 2016-12-14 12:41:07 +05:30
Neil Trini Lasrado
6a2fa29b4a Fixes for training Module 2016-12-14 12:08:28 +05:30
bhupen
52b3924006 mendatory hours field 2016-12-14 11:32:23 +05:30
OluyomiKay
8f8fd39855 erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation 2016-12-14 13:25:58 +08:00
Neil Trini Lasrado
fef568ecfa Documentation for Training Module 2016-12-13 16:48:50 +05:30
Neil Trini Lasrado
984ee372e8 [new Feature] Added Training Module 2016-12-13 15:42:12 +05:30
bhupen
b42dc5a899 mendatory hours field 2016-12-13 15:25:53 +05:30
strixaluco
757d127844 [docs] mention UID in LDAP instruction 2016-12-13 17:54:41 +08:00
Nabin Hait
80cea9795e Address naming if multiple address for same type 2016-12-13 14:50:35 +05:30
Nabin Hait
201af80706 Fixed merge conflict 2016-12-13 14:30:32 +05:30
Nabin Hait
3bfe01d1e0 Merge branch 'hotfix' 2016-12-13 14:22:15 +05:30
Nabin Hait
9d56d598bf bumped to version 7.1.24 2016-12-13 14:52:15 +06:00
Kanchan Chauhan
b79aa1d091 [Minor] Read permissions to Employee on Activity Type and Appraisal Template 2016-12-13 14:16:57 +05:30
Nabin Hait
403bab07a0 Merge pull request #7204 from frappe/revert-7199-email_cc_dev 
Revert "email cc test fixes for frappe/frappe#2441"
 2016-12-13 14:12:12 +05:30