Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
95,140 Commits 35 Branches 179 Tags 1.7 GiB
7cf1a97673
Commit Graph

5401 Commits

Author SHA1 Message Date
Laurent Destailleur
b0c2ccafcd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-08-10 10:47:05 +02:00
Laurent Destailleur
d3fc152001 Merge 2023-08-10 10:46:44 +02:00
Laurent Destailleur
e8fd551043 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2023-08-10 10:43:44 +02:00
Laurent Destailleur
34b3113bb7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2023-08-10 10:41:20 +02:00
Laurent Destailleur
90854dc2bf FIX Use the wrong logo size on PDF 2023-07-30 19:53:56 +02:00
Laurent Destailleur
b44ddaa696 FIX Use the wrong logo size on PDF 2023-07-30 18:04:03 +02:00
Noé Courtier
276168ef6f Fix: tabhelp must be present in every module 2022-07-19 17:14:57 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
ac975ecc61 Undo changes 2021-11-30 13:30:17 +01:00
Ferran Marcet
5265cd8084 Fix: correctly display the products of a warehouse in the pdf 2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f dejar igual que 13 2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11 Merge branch '13.0up' into 13.0 
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
 2021-11-26 12:29:38 +01:00
Laurent Destailleur
19b9412c13 FIX #19305 2021-11-05 12:49:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Ferran Marcet
9f23528ccd Fix: Import don't work if extrafield is separator 2021-10-29 12:39:22 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 17:59:07 +02:00
Laurent Destailleur
74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-09-01 17:54:21 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle 
Thirdparty wrongly fetched was causing errors on mass generation
 2021-08-31 16:10:55 +02:00
Florian HENRY
c928de89c6 fix: print barcode sould not be available for external user 2021-07-16 10:41:06 +02:00
Laurent Destailleur
5b34ea6c22 FIX permission to close a proposal when using advanced permissions 2021-07-01 03:06:40 +02:00
Laurent Destailleur
781df5a8a8
Merge pull request #18016 from fappels/13_fix_klaas 
FIX #17919 pictures in docs.
 2021-06-26 12:22:57 +02:00
Francis Appels
ec805d36fe Remove deprecated level parameter. 2021-06-25 10:02:23 +02:00
Francis Appels
88f7ca9214 Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE 2021-06-24 12:27:39 +02:00
Laurent Destailleur
a2d451dbfb Missing extrafield on report 2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b Fix missing posYAfterImage for nexy for espadon and squille 2021-06-24 12:15:29 +02:00
Francis Appels
d20bd5bcf6 fix ctrl-y 2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505 FIX #17919 pictures in docs. 
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
 2021-06-24 10:12:34 +02:00
Gauthier PC portable 024
50bc832532 FIX : better correction 2021-06-17 10:48:48 +02:00
Gauthier PC portable 024
657972b79b FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty 2021-06-16 16:49:24 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning 
Fix php 7 warning : Only variables should be passed by reference
 2021-06-10 12:20:26 +02:00
John BOTELLA
5131ab5199 Fix php 7 warning : Only variables should be passed by reference 2021-06-08 12:36:08 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Florian HENRY
6f3d19b7b6 dol_concatdesc better than concat operator 2021-05-17 15:12:25 +02:00
Florian HENRY
f95bd2f439 fixw that 2021-05-17 11:40:36 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00