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
94,761 Commits 35 Branches 179 Tags 1.7 GiB
9f23528ccd
Commit Graph

5379 Commits

Author SHA1 Message Date
Ferran Marcet
9f23528ccd Fix: Import don't work if extrafield is separator 2021-10-29 12:39:22 +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
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity 
add entity check on verif_dispo mod_codeclient_elephant
 2021-05-11 19:13:17 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
Laurent Destailleur
3807804acc Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2021-05-05 00:15:52 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
Florian HENRY
99b7deba14 Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu 2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256 fix double test 2021-04-16 10:37:42 +02:00
Laurent Destailleur
38f54d0582 FIX Missing extrafields into export of agenda record 2021-04-16 10:26:35 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php 2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php 2021-04-13 09:53:51 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php 2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9
Update pdf_azur.modules.php 2021-04-13 09:49:03 +02:00
Frédéric FRANCE
fcca5d7d5c
Update pdf_sponge.modules.php 2021-04-13 09:47:15 +02:00
Frédéric FRANCE
9ce6d841cc
Update pdf_crabe.modules.php 2021-04-13 09:40:16 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00