Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d6f3fc9fe7 Fix use the getSalesRepresentative function instead of get_users 2018-03-22 16:05:50 +01:00
Laurent Destailleur
aa859f980d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-22 14:21:17 +01:00
Laurent Destailleur
87815265c8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 7.0.1 2018-03-22 14:19:56 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
5efb94b06f Prepare 5.0.6 6.0.6 2018-03-22 14:13:58 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
86e496963b Merge pull request #8081 from atm-maxime/new_salesrep 
NEW improve way of adding users/sales representative to thirdparty
 2018-03-22 14:05:44 +01:00
Laurent Destailleur
99d88b0fa9 Merge pull request #8435 from enstentechnologies/7.0 
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
 2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494 Update propal.lang 2018-03-22 14:04:33 +01:00
Laurent Destailleur
a7cb811b39 Merge pull request #8431 from fappels/7.0_fix_products_translation 
Fix products translation
 2018-03-22 13:51:37 +01:00
Laurent Destailleur
4c1dcc37d1 Fix packager 2018-03-22 13:38:28 +01:00
Laurent Destailleur
2ee0e68d67 Fic packaging tools 2018-03-22 13:22:33 +01:00
vabeltran
3793fd69e6 FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang 
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
 2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
4eec7db731 Prepare 7.0.1 2018-03-22 13:13:04 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
John
b4983d0e6d FIX invoice filter 2018-03-22 11:37:16 +01:00
John
fd86e90df2 Add create creadit note btn 2018-03-22 11:19:39 +01:00
fappels
3765bc4775 Fix html escape for edit label 2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9 Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION 2018-03-22 10:46:54 +01:00
Laurent Destailleur
6e52c896f2 Dolibarrize module ticket 2018-03-22 10:46:42 +01:00
Laurent Destailleur
3b55049895 Dolibarrize module ticket 2018-03-22 10:23:25 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
florian HENRY
4ebb138533 last ones 2018-03-21 23:03:22 +01:00
florian HENRY
487ef3b7c9 cealn again 2018-03-21 23:01:20 +01:00
florian HENRY
c8d309e599 clean 2018-03-21 23:00:33 +01:00
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
florian HENRY
d3ae285c0c finish work 2018-03-21 22:58:17 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
7b6104de38 Merge pull request #8427 from ATM-Consulting/develop_atm 
NEW: method Form::selectArrayFilter() + use in left menu search
 2018-03-21 20:44:44 +01:00
Laurent Destailleur
0cba7fc761 Update main.inc.php 2018-03-21 20:44:32 +01:00
Laurent Destailleur
a54316ef05 Update main.inc.php 2018-03-21 20:43:26 +01:00
Laurent Destailleur
49f7c64f5e Merge pull request #8422 from dolibarr95/patch-41 
NEW Add dol_print_phone in thirdparty list page
 2018-03-21 20:40:59 +01:00
Laurent Destailleur
7d5c3a5c4f Merge pull request #8426 from atm-ph/fix_5.0_files_lost_on_contract 
Fix documents are lost if we rename contrat ref
 2018-03-21 20:40:23 +01:00
Laurent Destailleur
10d7e7d289 Merge pull request #8425 from atm-florian/dev_scrunit 
Dev scrunit
 2018-03-21 20:40:01 +01:00
Laurent Destailleur
423bd56646 Merge pull request #8423 from grandoc/new_branch_20_03_2018 
New [*use loadLangs for translation files*]
 2018-03-21 20:39:40 +01:00
Laurent Destailleur
5556986001 Trad 2018-03-21 20:15:21 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
b3bb6d88e6 Fix list of leave not complete for a manager 2018-03-21 19:17:42 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Marc de Lima Lucio
08fcd67e0f FIX: travis 2018-03-21 16:23:28 +01:00
Marc de Lima Lucio
744c263c6c NEW: selectArrayFilter() + use in left menu search 2018-03-21 15:08:20 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Laurent Destailleur
7e5c3cc807 Code comment 2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2 Use font-awsome for play icon 2018-03-21 13:16:05 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00