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
Laurent Destailleur
d8de78dca9 Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Laurent Destailleur
8acf7298b2 FIX CSS 2019-09-29 19:22:01 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
Laurent Destailleur
138b494b98 Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
881b69d117 Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
eb7f964268 Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
7386ba61d7 Merge pull request #11673 from ptibogxiv/patch-221 
NEW display supplier in objectline if defined
 2019-09-07 10:50:32 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
ptibogxiv
ad38478fc6 Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
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