Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 16:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
107,540 Commits 37 Branches 191 Tags
4e9c7afc01acfc68c74ca7c7f4707e95076d1137
Commit Graph

7531 Commits

Author SHA1 Message Date
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
78ee498151 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-26 16:13:54 +01:00
Laurent Destailleur
488b35d096 Merge pull request #20232 from hregis/fix_missing_advanced_perms 
FIX missing advanced perms
 2022-03-24 20:32:58 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
94224e9275 Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
a06fc4691b Merge pull request #20394 from hregis/new_add_hook_in_commercialindex 
NEW add hooks in commercial index
 2022-03-23 16:05:12 +01:00
Laurent Destailleur
bc9ec3e2b9 Merge pull request #20395 from hregis/fix_uniformize_with_element_name 
FIX uniformize with element name "contact"
 2022-03-23 16:04:53 +01:00
Laurent Destailleur
a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2022-03-22 16:58:57 +01:00
Marc de Lima Lucio
3aae8cc3bb FIX: propal list: bad error management for set not ssigned mass action 2022-03-22 10:54:04 +01:00
Marc de Lima Lucio
d4f55ae116 FIX: propal list: bad error management in mass actions 2022-03-22 10:11:10 +01:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Regis Houssin
56280f340f NEW add hooks in commercial index 2022-03-18 11:55:45 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Laurent Destailleur
62f6686ad0 Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line 
[FIX] errors propagation and trigger position on delete proposal line
 2022-03-17 02:35:30 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Florian HENRY
a028e795f7 add missing colspan 2022-03-16 13:54:21 +01:00
BB2A Anthony Berton
a1ac38ae03 entity 2022-03-12 21:03:11 +01:00
BB2A Anthony Berton
368a247f95 New method 2022-03-12 18:53:27 +01:00
BB2A Anthony Berton
4f4c95344e Other 2022-03-12 16:36:32 +01:00
BB2A Anthony Berton
db799d7913 comm card propal preview 2022-03-12 16:00:22 +01:00
BB2A Anthony Berton
f3f1c9ba78 comm card order 2022-03-12 15:54:25 +01:00
Regis Houssin
c9cc067075 FIX missing parenthesis 2022-03-11 10:48:51 +01:00
Regis Houssin
e59befa76b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms 2022-03-11 10:46:14 +01:00
kamel
1f00dff4da Correction Stickler CI / stickler-ci 2022-03-09 11:40:26 +01:00
kamel
e06c386507 Fix errors propagation and trigger position on delete proposal line 2022-03-09 11:32:07 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Laurent Destailleur
6bb49797f8 Merge pull request #20243 from JohnXLivingston/fix_template_name_typo 
Fix: typo in template name
 2022-03-07 14:55:02 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Florian HENRY
801402f46a fix: #20267 2022-03-04 11:58:52 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
John Livingston
1ece554c92 Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
bd288f980d FIX On large proposal or invoice, fix n(n+1) sql into a n sql. 2022-03-01 14:52:47 +01:00
Regis Houssin
e5fd11c8e0 FIX missing advanced perms 2022-03-01 09:28:38 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966 Merge pull request #20071 from frederic34/patch-1 
NEW Hook getNomUrl available everywhere in tooltip of ref links
 2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00