Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,048 Commits 36 Branches 190 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

19498 Commits

Author SHA1 Message Date
Laurent Destailleur
de4142e23e FIX Add message from public interface 2019-07-19 23:57:35 +02:00
Alexandre SPANGARO
0af1206892 Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Laurent Destailleur
ec34ce1e64 Maxi debug of module ticket 2019-07-19 23:11:00 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
48b4aa4c8d Fix link to ticket 2019-07-19 18:29:33 +02:00
Laurent Destailleur
73af3542d1 FIX the feature to bill time spent was not enabled. 2019-07-19 16:18:14 +02:00
Laurent Destailleur
14751680d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 13:38:05 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
BadPixxel
b88d19e8e4 FIX: Units Scale Missing in Object CRUD 2019-07-19 12:24:53 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Regis Houssin
7ffc46e1da FIX When we are in update mode, so we use $this->entity 2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Laurent Destailleur
6c3a30e872 Fix log 2019-07-19 03:05:55 +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
738851441f Revert "Fix phpcs" 
This reverts commit dfe4debbd2.
 2019-07-18 18:18:03 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67 Merge 2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
dfe4debbd2 Fix phpcs 2019-07-18 17:34:38 +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
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +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
Laurent Destailleur
5d74c81941 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-15 23:48:40 +02:00
Laurent Destailleur
d694360c66 Fix warning 2019-07-15 23:46:54 +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
e1d4917704 FIX Missing field "Conciliated" into bank transaction export 2019-07-14 00:39:42 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
5ccb397af9 Merge pull request #11473 from hregis/9.0_security 
FIX better compatibility with multicompany transverse mode
 2019-07-13 23:42:36 +03:00
Laurent Destailleur
4dabdfa5ac Merge pull request #11483 from inoveaconseil/FIX_update_price 
FIX element name in update_price
 2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e Update commonobject.class.php 2019-07-13 22:29:50 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +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
Regis Houssin
41b004c2b8 FIX better compatibility with multicompany transverse mode 2019-07-10 12:16:32 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
709b738d75 Fix regression 2019-07-05 18:54:51 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
01b1b2e4a7 Fix syntax error 2019-07-04 17:07:26 +02:00