Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,280 Commits 36 Branches 189 Tags
c45c24f80c39bbf733c6acf36d7c04cf7883b91a
Commit Graph

4041 Commits

Author SHA1 Message Date
Laurent Destailleur
1a1dc39a6b Mark a duplicate function as deprecated 2016-04-06 14:53:14 +02:00
Alexis Algoud
a2c5bfa72c FIX parse error 2016-04-06 10:20:38 +02:00
Alexis Algoud
11bb4d1cfb Show in select 2016-04-06 10:17:13 +02:00
Juanjo Menent
b59b758016 Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project 
NEW : project sharing in select_projetcs_list function
 2016-04-05 17:48:23 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-04 16:22:26 +02:00
Florian HENRY
344a87f970 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-04-04 14:43:17 +02:00
gauthier
e043aebfa1 NEW : project sharing in select_projetcs_list function 2016-04-04 11:05:12 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded 
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
 2016-04-03 20:02:02 +02:00
Juanjo Menent
8f2fb64efb Merge pull request #4929 from aspangaro/4.0-p12 
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
 2016-04-03 16:20:31 +02:00
Florian HENRY
0ab40f11be Merge branch 'develop' into develop_advtargetemailiing 2016-04-03 11:29:17 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:46:01 +02:00
Laurent Destailleur
281b06a2d3 NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 2016-04-01 18:44:23 +02:00
Florian HENRY
081c7824d2 FIX : range is MySQL reserved word, cannot be used as column names 2016-04-01 14:00:14 +02:00
aspangaro
84d326e036 FIX: Problem with dolibarr installation/migration script. Range is a reserved name. 2016-04-01 06:41:49 +02:00
Laurent Destailleur
54f3005666 NEW Can select fields to show on proposal lists. 2016-03-31 11:58:05 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +02:00
aspangaro
26e017f4ef Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/accountancy/admin/card.php
 2016-03-30 06:05:38 +02:00
Laurent Destailleur
ff96ebf381 Enahnce navigation 2016-03-29 22:09:13 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-29 19:54:41 +02:00
Laurent Destailleur
4d37c47990 NEW Can select language from combo list on page to overwrite a 
translation
 2016-03-29 18:05:03 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
aspangaro
2be979569d Debug II 2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59 debug 2016-03-28 15:32:57 +02:00
aspangaro
436fb91901 Uniformize name of table 2016-03-28 14:50:51 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
Laurent Destailleur
40e0347bb5 More complete dependencies 2016-03-26 12:27:34 +01:00
Laurent Destailleur
0715353960 FIX A not enabled field for list must not into fields to add 2016-03-25 19:44:18 +01:00
Laurent Destailleur
d213002892 FIX A not enabled field for list must not into fields to add 2016-03-25 19:42:42 +01:00
Laurent Destailleur
7def29301a Merge pull request #4893 from defrance/patch-113 
FIX : add line of separation between left menu
 2016-03-25 18:21:52 +01:00
Laurent Destailleur
423120db17 Merge pull request #4876 from atm-alexis/NEW_multientity_for_project 
# New # multientity for project
 2016-03-25 18:01:45 +01:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Laurent Destailleur
30aea901b8 Merge pull request #4855 from marcosgdf/account-oop 
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
 2016-03-25 17:41:39 +01:00
BENKE Charlie
bf2d52894a correct travis too 2016-03-25 16:48:45 +01:00
Laurent Destailleur
61bc8fc9ef NEW Can edit value date of a vat payment after recording it. 
Conflicts:
	htdocs/compta/localtax/card.php
	htdocs/core/class/html.form.class.php
 2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5 NEW #3510 : Standardize module 2016-03-25 15:59:44 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d Revert "Corrected non-static usages of Form::multiselectarray function" 
This reverts commit 0a53cdd88f.
 2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
68e06a4634 Revert "NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions" 
This reverts commit 4d78932fe8.
 2016-03-25 15:34:23 +01:00
Laurent Destailleur
4dc6acafe0 Revert "NEW Converted Form::selectyesno to a static function" 
This reverts commit 5a9e686bf9.
 2016-03-25 15:34:06 +01:00
Laurent Destailleur
2220f7f6f2 Revert "NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm" 
This reverts commit a0926abd13.
 2016-03-25 15:31:28 +01:00
Laurent Destailleur
e7a02d77a6 Revert commit 2016-03-25 15:31:17 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b NEW Can edit value date of a vat payment after recording it. 2016-03-25 14:49:48 +01:00
Juanjo Menent
922c57da76 NEW #3510 : Standardize module 2016-03-23 22:45:04 +01:00
Alexis Algoud
c3bdc6372d NEW allow project to be shared across entities 2016-03-22 16:48:51 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00