Laurent Destailleur
61a7f54877
Fix look and field
2020-07-06 15:55:41 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
3d8d55a531
Fix bad path in import section
2020-06-29 14:42:09 +02:00
Laurent Destailleur
8bb11039dc
Clean code
2020-06-29 09:56:04 +02:00
Laurent Destailleur
d5324ff3db
Fix template
2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15
Fix template
2020-06-27 14:38:40 +02:00
Laurent Destailleur
10a4188eff
Clean template
2020-06-26 01:14:24 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69
Fix return code not returned
2020-06-24 09:55:10 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
42860d752c
Fix templates
2020-06-17 22:11:22 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
9f8a3916c2
FIX #14051 #14052
2020-06-07 19:37:42 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
7061e9b4cb
Fix deletion of website page
2020-06-06 18:57:24 +02:00
Laurent Destailleur
cd4c161ca7
Merge pull request #14005 from bafbes/abb110214
...
Fix:To get translated, the key need to be one single word
2020-06-01 21:09:53 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89
Fix perms
2020-06-01 16:46:11 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
Laurent Destailleur
b648f30482
Fix perms
2020-06-01 14:52:26 +02:00
Laurent Destailleur
adb20c6a90
checkstyle
2020-06-01 12:36:09 +02:00
Laurent Destailleur
c8d0476728
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908
Fix several troubles into numbering modules.
...
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5
Debug modulebuilder
2020-06-01 00:01:23 +02:00
Laurent Destailleur
28df07225d
Debug modulebuilder
2020-05-31 23:23:56 +02:00
Laurent Destailleur
62dacfa713
Debug modulebuilder
2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c
Fix debug modulebuilder for doc and ref generation
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae
Fix debug modulebuilder for doc and ref generation
2020-05-31 22:59:33 +02:00
bahfir abbes
cf68317ae7
fix:Clé de langue dans les titres de menus
2020-05-31 00:56:51 +01:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
f9ac4c2ada
Fix template
2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37
Fix template
2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4
Fix template
2020-05-30 01:17:23 +02:00
Laurent Destailleur
e2656ff2f8
Update template
2020-05-30 00:49:11 +02:00
Laurent Destailleur
540a64bbba
Fix templates
2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4
Fix template
2020-05-29 21:48:27 +02:00
Laurent Destailleur
7f8c0d0e7a
Fix templates
2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c
Fix template
2020-05-29 15:13:16 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa
Look and feel v12
2020-05-25 14:08:36 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Philippe GRAND
23282acfbc
update
2020-05-21 11:20:01 +02:00
