Commit Graph

49190 Commits

Author SHA1 Message Date
BENKE Charlie
ec9955986f Update admin.lib.php 2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747 Update admin.lib.php 2015-10-21 05:06:19 +02:00
BENKE Charlie
e2a738bf54 New fonction complete_elementList_with_modules
if contactelement is defined on module definition, add module on definition type of contact
2015-09-08 13:11:26 +02:00
BENKE Charlie
b4a9a0cafb Allow contact definition on additionnal modules
If additionnal module use contactelement feature, the module is referenced on element list on contact type
2015-09-08 13:07:13 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Laurent Destailleur
5529ef7a50 Better doc 2015-09-07 20:53:16 +02:00
Laurent Destailleur
9667b6a7c6 Solve conflict of var name 2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c Fix memcached effect was lost because init was done each time. 2015-09-07 20:17:05 +02:00
Laurent Destailleur
53a9c93b90 Fix PHPCS 2015-09-07 15:16:43 +02:00
Laurent Destailleur
3ae19375cd Merge pull request #3474 from aspangaro/3.8-16
Fix Problem with checked input when you edit a survey
2015-09-07 15:11:18 +02:00
Laurent Destailleur
5d285bf56d Merge pull request #3478 from grandoc/develop
translations missing
2015-09-07 15:09:31 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
fc35c4e3f0 Add migration script for 3.9 2015-09-07 14:01:59 +02:00
Laurent Destailleur
2de690259a Add migration script for 3.9 2015-09-07 14:01:05 +02:00
Laurent Destailleur
fe60927503 Fix button must appears if box selected 2015-09-07 13:30:02 +02:00
Laurent Destailleur
7f05e19e0d Prepare 3.9 2015-09-07 13:24:52 +02:00
Laurent Destailleur
3333970eb4 Prepare 3.9 2015-09-07 13:23:51 +02:00
Laurent Destailleur
1b3db2ca41 NEW Add none/all selection into list of files for FTP browser module 2015-09-07 13:20:44 +02:00
philippe grand
ff3968b07f translations missing 2015-09-07 12:46:49 +02:00
Laurent Destailleur
a44ab5168c Save memory. 2015-09-07 12:43:25 +02:00
Laurent Destailleur
5ffab9720f More complete connexion profile 2015-09-07 12:38:39 +02:00
Laurent Destailleur
28c62fb214 Introduce a function to return a warning by loggers. 2015-09-07 12:21:26 +02:00
Laurent Destailleur
f3c71a9a5a Dolibarr must not contains autoload feature.
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
2015-09-07 12:09:42 +02:00
Laurent Destailleur
e85921c82f Start to introduce sftp 2015-09-07 11:45:33 +02:00
Laurent Destailleur
91ddca6ab0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
2015-09-06 16:34:40 +02:00
Laurent Destailleur
822d4d1b39 Fix remove log 2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 15:00:17 +02:00
Laurent Destailleur
7c2b6e7780 Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 14:55:29 +02:00
Laurent Destailleur
0d811dce6a Start to mutualize the builddoc and remove_file action. 2015-09-06 14:21:42 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
aspangaro
e88d7076a6 Fix Problem with checked input when you edit a survey 2015-09-06 07:58:49 +02:00
aspangaro
1756862a65 Typo 2015-09-06 07:56:43 +02:00
Laurent Destailleur
a21b015cbb Fix XSS 2015-09-05 20:03:02 +02:00
Laurent Destailleur
389cb00164 Prepare code to mutualise buildodc and remove_file 2015-09-05 20:02:38 +02:00
Laurent Destailleur
873f33b8ab Missing translation 2015-09-05 11:22:14 +02:00
Laurent Destailleur
1b9b0082ba Merge pull request #3387 from defrance/patch-75
NEW: add intervention Aera
2015-09-05 11:19:37 +02:00
Laurent Destailleur
d108881690 Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone
NEW : conf to use next product/service ref when we clone a product/se…
2015-09-05 10:57:11 +02:00
Laurent Destailleur
974ea7cd79 Merge branch 'patch-61' of https://github.com/defrance/dolibarr into develop
Conflicts:
	htdocs/core/tpl/contacts.tpl.php
	htdocs/societe/class/societe.class.php
2015-09-05 10:52:35 +02:00
Laurent Destailleur
9cf6b824d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 10:50:42 +02:00
Laurent Destailleur
6a9933d9af Update doc 2015-09-05 10:49:55 +02:00
Laurent Destailleur
fbbea5b9e1 Merge pull request #3468 from GPCsolutions/composer
Updated composer links
2015-09-05 10:28:09 +02:00
Laurent Destailleur
c03d508bd3 Merge pull request #3467 from guerrierk/develop
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
087938e340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/bank/class/account.class.php
2015-09-05 10:25:01 +02:00
Laurent Destailleur
ce17ee2b88 git push origin developMerge branch 'open-minds-patch-2' into develop 2015-09-05 10:23:06 +02:00
Laurent Destailleur
6ac4b8d0d4 Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2 2015-09-05 10:22:43 +02:00
Laurent Destailleur
4c0f117e55 Merge pull request #3465 from open-minds/patch-1
Fix detailed information of BBAN for Germany
2015-09-05 10:22:12 +02:00
Laurent Destailleur
25d89f3b2b Merge pull request #3469 from frederic34/patch-9
Typo
2015-09-05 10:21:33 +02:00
Frédéric FRANCE
132a464df6 Update product.php 2015-09-05 08:57:01 +02:00