lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,762 Commits 43 Branches 150 Tags 886 MiB
af2df62aaa
Commit Graph

1460 Commits

Author SHA1 Message Date
Laurent Destailleur
d2d7fb4b04 Fix management of collapsing of extrafields separators. 2019-08-21 03:38:57 +02:00
Laurent Destailleur
2510c1e5e4 Better help text 2019-08-16 03:05:55 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
ptibogxiv
b06bfef632
NEW display supplier in objectline if defined 2019-08-11 13:08:17 +02:00
wdammak
909dbfab96
Update objectline_edit.tpl.php 
optimization code (double declaration deletion)
 2019-08-10 16:35:02 +02:00
Laurent Destailleur
76d721559c
Merge pull request #11630 from hregis/9.0_html 
FIX adding a "div" for better interaction with login submit button
 2019-08-10 01:41:19 +02:00
Regis Houssin
e81ccf1cff FIX addinf a "div" for better interaction with login submit button 2019-08-04 17:21:13 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Maxime Kohlhaas
5c2763d0dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin 2019-07-27 10:53:43 +02:00
Laurent Destailleur
d6d1b29257 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-21 16:15:32 +02:00
Laurent Destailleur
4f34a8b6e8 FIX Position was lost when we edit the line of template invoice 2019-07-21 16:15:13 +02:00
Laurent Destailleur
932530bd37 FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on 2019-07-21 16:00:32 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
b9fe874b5f Revert "Merge pull request #11022 from altatof/freetext" 
This reverts commit 879b4d8e7f, reversing
changes made to ddc01b4c27.
 2019-07-18 18:19:51 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext 
NEW : manage output languages for free text
 2019-07-18 17:29:45 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Laurent Destailleur
01b1b2e4a7 Fix syntax error 2019-07-04 17:07:26 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1 
Feature request: Extrafields - store computed value #11435
 2019-07-04 16:23:08 +02:00
Laurent Destailleur
0d738a04f9
Update admin_extrafields_edit.tpl.php 2019-07-04 16:22:10 +02:00
Laurent Destailleur
f14b0b4fcc
Update admin_extrafields_add.tpl.php 2019-07-04 16:20:01 +02:00
Laurent Destailleur
b691396fce
Update admin_extrafields_add.tpl.php 2019-07-04 16:19:24 +02:00
Laurent Destailleur
f2c1568d09 NEW Extrafields separator can be collapsed or not 2019-07-04 15:43:05 +02:00
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
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product 
NEW: Resources tab possible in products/services
 2019-04-08 13:57:30 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
atm-ph
285e60e9f1 Fix default filter 2019-04-05 10:57:50 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
26e3f41f73 Translation 2019-03-29 16:18:47 +01:00
atm-ph
fa41eeec7f New evol "Input per week" display 2019-03-21 14:21:29 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on 
forms and list but not on creation forms.
 2019-03-12 17:45:19 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
Laurent Destailleur
1ab3949e9c Optimize js code 2019-03-06 13:01:01 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Frédéric FRANCE
b5def5fd59
Update admin_extrafields_view.tpl.php 2019-03-02 18:11:47 +01:00
atm-quentin
e39f85ac4d FIX js focusing 2019-02-27 09:23:39 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00