lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,648 Commits 43 Branches 150 Tags 886 MiB
3b4fe0d582
Commit Graph

86648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
f91e7e4917
Merge pull request #13922 from atm-lena/11.0_NEW_AddHook_SelectWarehouses 
11.0 new add hook select warehouses
 2020-06-02 13:27:01 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
atm-lena
ae9c490134 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses 2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00
Laurent Destailleur
6ddabd51c0 Update commonobject.class.php 2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf fix:le résultat de explode est troujours un array 2020-06-01 21:02:45 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
Laurent Destailleur
0f5eed60a2 Update commonobject.class.php 2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752 fix:bad database quotation for booleans 2020-06-01 20:40:51 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342 
FIX php error
 2020-06-01 20:17:22 +02:00
Laurent Destailleur
6cc512ea16
Merge pull request #14016 from atm-florianm/FIX_11.0_check_file_exists_after_pdftk_massgeneration 
FIX 11.0 - when using pdftk for pdf concatenation, check if file was created before saying so
 2020-06-01 20:10:08 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0 
Fix QR and add QR customer menu
 2020-06-01 20:07:21 +02:00
andreubisquerra
b0f904508a
Fix travis 2020-06-01 17:52:38 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
andreubisquerra
8abe60db0b
Add Restaurant QR menu 2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887
Update QR 2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517
Update settings 2020-06-01 17:02:11 +02:00
andreubisquerra
c60982ce60
Update langs 2020-06-01 16:58:05 +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
c4d8f0b6cc css 2020-06-01 12:35:27 +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
5a8c4ad3f5 Debug modulebuilder 2020-06-01 00:01:23 +02:00
Laurent Destailleur
e83b754e6f Debug modulebuilder 2020-05-31 23:32:36 +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
c04903d15c Fix debug modulebuilder for doc and ref generation 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-05-31 23:01:13 +02:00
ptibogxiv
a33f503a0d
FIX php error 
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
 2020-05-31 14:28:41 +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
e8016a5e7e Fix credit-transfer vs direct debit 2020-05-30 23:46:14 +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
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
Laurent Destailleur
b61b8ee1fb Fix token renewal 2020-05-30 02:27:10 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +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