Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
98,974 Commits 36 Branches 189 Tags
0c8b74b54cd4817002697cb15e5475e74bc505d9
Commit Graph

9443 Commits

Author SHA1 Message Date
andreubisquerra
662caadd18 Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS 2021-04-14 23:32:08 +02:00
Laurent Destailleur
25a6aa1388 NEW Add data-eec=1 for EEC countries on select for js interaction 2021-04-13 22:50:50 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Robin
0839ee25cd FIX missing parameter in select for POP 
All options can be modified for selector in pop
 2021-04-13 10:44:14 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
8fa943edc3 Fix select field in multiselect of languages 2021-04-12 14:26:09 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
Laurent Destailleur
93269bab9e Merge pull request #17183 from OPEN-DSI/fix_00005 
FIX : Fix warning
 2021-04-08 13:14:53 +02:00
kamel
1ec6317b80 FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors) 2021-04-08 10:33:27 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
Günter Lukas
04a55a3df3 Fix #17146 2021-04-07 09:08:34 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
d4f14183b7 Code comment 2021-04-01 13:15:23 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434 FIX #yogosha5775 2021-04-01 11:27:39 +02:00
Laurent Destailleur
6fc70fba8c Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Frédéric FRANCE
1823fb34bb Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
14c7ce7492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
 2021-03-31 13:59:21 +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
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
UT from dolibit
34077d5b8a Update canvas.class.php 2021-03-30 18:31:36 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
9edb2fd857 Fix sql error 2021-03-30 02:13:57 +02:00
Laurent Destailleur
3616d2ba44 FIX #yogosha5770 2021-03-29 23:24:52 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
ae0468e107 FIX #yogosha5765 2021-03-29 21:04:33 +02:00
Laurent Destailleur
a4987c6e4f Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1 2021-03-29 12:10:35 +02:00
Laurent Destailleur
85f6a15678 Fix position of users in combo list 2021-03-29 11:58:51 +02:00