Commit Graph

87039 Commits

Author SHA1 Message Date
Laurent Destailleur
bdeee9ea99
Merge pull request #14007 from bafbes/abb110216
fix:replace some bd field types by their correspondant field type
2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae
Update index.php 2020-06-01 20:54:24 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php 2020-06-01 20:39:49 +02:00
Laurent Destailleur
33859bac2c
Merge pull request #14012 from andreubisquerra/master
TakePOS QR customer menu
2020-06-01 20:37:29 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
Laurent Destailleur
0362d28cf7
Update commonobject.class.php 2020-06-01 20:13:27 +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
4af17a342c Doc 2020-06-01 00:00:24 +02:00
Laurent Destailleur
e83b754e6f Debug modulebuilder 2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
28df07225d Debug modulebuilder 2020-05-31 23:23:56 +02:00
Laurent Destailleur
3349144f5e Fix lose enabled and default when editing field signatures in
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +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
Laurent Destailleur
6e55abe831 Rename var to include "array" into name 2020-05-31 20:57:16 +02:00
Laurent Destailleur
b24c0e57a6 Fix transifex 2020-05-31 10:29:38 +02:00
bahfir abbes
f76c025a7b fix:this is required to navigate by id 2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732 fix:bad database quotation for booleans 2020-05-31 01:41:04 +01:00
andreubisquerra
3ddce9f0df
Fix travis 2020-05-31 02:34:46 +02:00
stickler-ci
a5ed630a57 Fixing style errors. 2020-05-31 00:19:21 +00:00
jove@bisquerra.com
5f49586f12 TakePOS customer menu QR 2020-05-31 02:17:33 +02:00
bahfir abbes
fe52539787 fix:rempalcement de qqes valeurs de champs de BDDs par les valeurs adéquates 2020-05-31 01:14:44 +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
6123596ec9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
bc1724a3aa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-31 00:23:40 +02:00
Laurent Destailleur
4303d3d3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/margin/tabs/productMargins.php
2020-05-31 00:23:33 +02:00
Laurent Destailleur
8b03a5e225 Fix phpcs 2020-05-31 00:22:17 +02:00
Laurent Destailleur
94e02269ee Fix: missing fk_project 2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba FIX Missing ref into popup 2020-05-30 23:52:47 +02:00
Laurent Destailleur
90b9fd1461 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-30 23:51:13 +02:00
Laurent Destailleur
02bf646abe FIX Missing ref into popup 2020-05-30 23:51:02 +02:00
Laurent Destailleur
e8016a5e7e Fix credit-transfer vs direct debit 2020-05-30 23:46:14 +02:00
Laurent Destailleur
f191cec3ef
Merge pull request #13999 from OPEN-DSI/fix_erreur_facture
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:31 +02:00
Laurent Destailleur
2696a6a4d0
Merge pull request #14000 from OPEN-DSI/fix_erreur_facture_v10
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:08 +02:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
52af430ae2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-30 14:20:16 +02:00
Laurent Destailleur
e223189507 FIX #14002 2020-05-30 14:20:04 +02:00
Laurent Destailleur
c6c12e7d7a Add picto 2020-05-30 13:21:28 +02:00
Laurent Destailleur
a3b5d649e6 Clean images for v12 2020-05-30 12:30:05 +02:00
Laurent Destailleur
dfb5f02f4b Fix token renewal 2020-05-30 02:40:05 +02:00