Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-30 04:43:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

9579 Commits

Author SHA1 Message Date
Laurent Destailleur
8cf99448e1 Merge pull request #17523 from bb2a/warhouse_mod_stock_activ 
Warehouse filter if stock activate and not sending
 2021-05-11 20:43:28 +02:00
Pierre Payet
4ce81ee535 set new outside the loop, add fetch result check 2021-05-11 20:30:57 +02:00
Laurent Destailleur
780254bfd4 Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Laurent Destailleur
8024e769fd Merge pull request #17552 from aspangaro/14b2 
Fix Title customer proposal
 2021-05-11 18:55:02 +02:00
Pierre Payet
ff178667a3 add thirdparty customer code to substitutionarray 2021-05-11 12:33:35 +02:00
Dorian Vabre
e31d8f89f5 wip filter 2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Alexandre SPANGARO
6e9597cd90 Fix Title company customer card 2021-05-09 22:06:05 +02:00
Alexandre SPANGARO
c2319c0a20 Fix Title customer proposal info card 2021-05-09 21:19:13 +02:00
Alexandre SPANGARO
9cec7e5936 Fix Title customer proposal documents card 2021-05-09 21:15:54 +02:00
Alexandre SPANGARO
dbccb75294 Fix Title customer proposal notes card 2021-05-09 21:13:29 +02:00
Alexandre SPANGARO
dd76ff0f24 Fix Title customer proposal contact card 2021-05-09 21:11:14 +02:00
Alexandre SPANGARO
2dc2256545 Fix Title customer proposal card 2021-05-09 21:08:55 +02:00
daraelmin
22d9c4c166 Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1 add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
Anthony Berton
2e50fde9aa edit_in_propal 2021-05-07 22:13:53 +02:00
daraelmin
7c27e9f931 too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
0173d8db5f Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Anthony Berton
d84b0bae9d init 2021-05-06 23:23:50 +02:00
daraelmin
866857c111 Html link instead of url in substitutionarray 2021-05-04 21:57:59 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
daraelmin
034378a958 Add online substitution keys link in mailing 2021-05-04 00:58:29 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
d1f11d2e65 Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
Laurent Destailleur
6dcee425a1 Update card.php 2021-04-28 15:07:31 +02:00
Sylvain Legrand
18d2bef8f3 Error 500 on propal card when we change the deadline 
if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
 2021-04-28 11:58:34 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
e9b8e81773 Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
539954f760 Clean code 2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a Clean code 2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00