Commit Graph

50561 Commits

Author SHA1 Message Date
Laurent Destailleur
1f44bb5947 Merge pull request #3495 from FHenry/3.7
FIX : multientity warehouse management
2015-09-08 20:58:48 +02:00
Juanjo Menent
355fcc78cf Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 20:48:31 +02:00
Laurent Destailleur
10aacb8811 Fix code generator 2015-09-08 20:08:47 +02:00
Juanjo Menent
4b031e9e6a Merge pull request #3473 from aspangaro/develop-63
New: Accountancy rename llx_accountingaccount in llx_accounting_account
2015-09-08 20:06:00 +02:00
Juanjo Menent
45a94b055a Merge pull request #3488 from GPCsolutions/transifex
Qual: Fixed translation strings
2015-09-08 19:55:56 +02:00
Juanjo Menent
0c447d7497 Merge pull request #3487 from GPCsolutions/unused
Qual: removed unused translation token
2015-09-08 19:55:08 +02:00
Juanjo Menent
5d401f275c Merge pull request #3486 from GPCsolutions/debug
Qual: remove debug output
2015-09-08 19:54:42 +02:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
Florian HENRY
63a817c3a4 Fix wahrehouse multientty management 2015-09-08 16:13:15 +02:00
Florian HENRY
52cb9581ff Fix multientity stock management 2015-09-08 16:00:13 +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
aspangaro
16585553c1 Merge remote-tracking branch 'Upstream/develop' into develop-64 2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1 Add constant in modAccounting.class.php 2015-09-07 21:51:48 +02:00
aspangaro
cf869f22b5 Merge remote-tracking branch 'Upstream/develop' into develop-63
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-07 21:45:13 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +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
Raphaël Doursenaud
e85c510b87 Qual: Fixed translation strings 2015-09-07 19:44:10 +02:00
Raphaël Doursenaud
3624ae0ec7 Qual: removed unused translation token 2015-09-07 19:16:44 +02:00
Raphaël Doursenaud
71b98ffc0e Qual: remove debug output 2015-09-07 17:15:41 +02:00
philippe grand
706f62d8f2 better display for code 2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
92c08c77fd Qual: Don't attempt HTTPS redirect if already using HTTPS 2015-09-07 16:43:17 +02:00
Raphaël Doursenaud
1168f0b6ae Fix regression introduced by f3c71a9a5a 2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5 translations missing 2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +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
e5ad14442a Merge pull request #3472 from aspangaro/3.7-5
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
2015-09-07 15:10:20 +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
Florian HENRY
7505537a3e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-07 11:39:00 +02:00