Commit Graph

77140 Commits

Author SHA1 Message Date
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
251d501c8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-14 00:32:46 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +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
8090a8abb6 Fix param [] -> null 2019-07-14 00:07:27 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf
FIX : We must save code instead of value in database…
2019-07-14 00:19:13 +03: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
9409c9e246
Merge pull request #11464 from OPEN-DSI/new-api-contacts-setcategories
NEW Add a category to a contact in API
2019-07-13 23:41:56 +03:00
Laurent Destailleur
f285bed2ff
Merge pull request #11479 from atm-gauthier/8.0_fix_report_by_tva
FIX : accounting mode must be taken from global conf, because there's…
2019-07-13 23:40:15 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
Laurent Destailleur
5446fe9e23
Merge pull request #11468 from frederic34/patch-7
Update ihm.php
2019-07-13 23:36:36 +03:00
Laurent Destailleur
edd51bb150
Merge pull request #11469 from atm-maxime/fix_prelevement_rum
Fix : use RUM if defined in bank account
2019-07-13 23:34:31 +03:00
Laurent Destailleur
f34d96b5fb
Merge pull request #11475 from atm-lena/9.0_fix_help_text
FIX help text
2019-07-13 23:32:35 +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
a45c563e36
Merge pull request #11500 from hregis/10.0_ldap
FIX this function can not be private
2019-07-13 22:57:13 +03:00
Laurent Destailleur
db2e1d88a3
Merge pull request #11499 from hregis/9.0_bug2
FIX __INFOS__ tag not exists
2019-07-13 22:48:05 +03:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +02:00
gauthier
cce8f98afc FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface 2019-07-10 16:33:03 +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
Maxime Kohlhaas
0aa42fefae Fix : use RUM if defined in bank account 2019-07-09 18:13:11 +02:00
Frédéric FRANCE
96723db86f
Update main.inc.php 2019-07-09 15:20:43 +02:00
Frédéric FRANCE
61c83117fe
Update ihm.php 2019-07-09 15:18:51 +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
VESSILLER
266ed86194 NEW Add a category to a contact in API 2019-07-08 12:37:24 +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
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
3af4ad7fc3 Compatibility with phpunit v6 2019-07-05 21:28:27 +02:00
Laurent Destailleur
ac9282667d Try new phpunit syntax 2019-07-05 21:09:21 +02:00
Laurent Destailleur
d3b4a91f41 NEW Can enter price tax incl on vendor proposal and purchase orders 2019-07-05 20:24:22 +02:00
Laurent Destailleur
bbb5b43e94 Fix duplicate trans 2019-07-05 19:03:16 +02:00
Laurent Destailleur
709b738d75 Fix regression 2019-07-05 18:54:51 +02:00
Laurent Destailleur
69db6e6aa7 Fix look and feel v10 2019-07-05 18:45:13 +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
93d9f73f1d Trans 2019-07-05 17:44:31 +02:00
Laurent Destailleur
42576eb27a Fix status of email templates not visible for non admin users 2019-07-05 17:22:13 +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
675b7b2e32 Fix link to reconcile 2019-07-05 13:11:30 +02:00
Laurent Destailleur
575dce2dff Fix css 2019-07-05 12:17:36 +02:00