Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

1430 Commits

Author SHA1 Message Date
Frans Bosman
9962243df3 Update admin_extrafields_edit.tpl.php 2019-07-03 16:19:51 +02:00
Frans Bosman
123cf7ce50 Update admin_extrafields_add.tpl.php 2019-07-03 16:16:45 +02:00
Frans Bosman
135e47892b Update admin_extrafields_add.tpl.php 2019-07-03 16:15:20 +02:00
Laurent Destailleur
2a3b4c3fd7 Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Laurent Destailleur
7d2cedfdcf Debug bom module 2019-06-03 19:29:49 +02:00
ptibogxiv
5b6821c191 FIX display job/fucnction in contact list 
Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)
 2019-05-29 16:55:44 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Marc de Lima Lucio
18a6ed17cf FIX: extrafield list search: SQL error when field is multiselect 2019-05-21 14:49:23 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Lionel VESSILLER
8bb4b3f339 Fix contact address substitution before sending by mail in shipment card 2019-05-06 11:12:56 +02:00
Lionel VESSILLER
87e83a7967 New add extrafield separator collapse with theses specific values 
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
 2019-05-03 16:14:44 +02:00
Laurent Destailleur
425dd6faf7 Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Frédéric FRANCE
ac304f58b0 clean new commits 2019-04-30 20:37:59 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
ef8bb1f5ca Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area 2019-04-29 20:55:45 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
287b8ebe53 Merge pull request #11060 from hregis/9.0_mc 
FIX missing compatibility with multicompany
 2019-04-24 11:33:16 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf FIX #11013 2019-04-24 11:23:49 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +02:00
Christophe Battarel
0b5cb9770f use dol_escapa_js 2019-04-18 09:59:39 +02:00
Christophe Battarel
20953d3522 fix javascript 2019-04-16 17:36:42 +02:00
Christophe Battarel
62f59a13af fix javascript 2019-04-16 17:30:57 +02:00
Christophe Battarel
f4cc1695f4 fix when ckeditor is not enabled 2019-04-16 17:22:33 +02:00
Christophe Battarel
c157cfad74 add freetextsubstitutionexclude parameter 2019-04-16 16:21:32 +02:00
Christophe Battarel
502b1e4d31 add lang management to freetext 2019-04-16 16:16:37 +02:00
Laurent Destailleur
7db0c0c705 Merge pull request #10993 from altatof/presend 
NEW : use outputlangs in fullname construction for emails
 2019-04-11 16:33:07 +02:00
Laurent Destailleur
862917edff NEW Tooltip with vat amount and price incl tax on lines of objects. 2019-04-10 21:24:23 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Christophe Battarel
79beb59385 use outputlangs in fullname construction for emails 2019-04-10 11:11:41 +02:00
Laurent Destailleur
861c1b412c CSS 2019-04-09 19:23:34 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425 Work on email collector 2019-04-09 13:23:30 +02:00
Laurent Destailleur
1b415a6aed Fix translation of help tooltip on fields for modulebuilder. 2019-04-08 14:42:46 +02:00