Commit Graph

83408 Commits

Author SHA1 Message Date
Laurent Destailleur
bfa13e16ed Debug MO module 2020-01-13 12:30:48 +01:00
Laurent Destailleur
5740d17450 Better help 2020-01-13 12:10:20 +01:00
Laurent Destailleur
3017d2ebe4 Merge pull request #12805 from OPEN-DSI/new-export-agenda-project-ref
NEW add project ref in events export
2020-01-13 11:50:39 +01:00
Laurent Destailleur
ce17f65b08 Merge pull request #12829 from atm-florian/11.0
Fix Warning
2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de change the PHPdoc 2020-01-13 10:43:39 +01:00
Francis Appels
ec23789f66 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-01-13 10:02:16 +01:00
Laurent Destailleur
a7496c16cb Doc 2020-01-12 22:00:23 +01:00
Laurent De Coninck
67d73c5488 Fix the select of the provider for one product 2020-01-12 21:56:35 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
6508ee03bf Fix for en_US 2020-01-12 21:27:43 +01:00
Laurent Destailleur
4716b82249 Fix clone of page 2020-01-11 14:44:12 +01:00
Laurent Destailleur
58e5eeabdd Fix to be able to use zip signature 2020-01-11 11:15:50 +01:00
Francis Appels
85775ffe11 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-01-11 09:38:14 +01:00
Laurent Destailleur
e03bff87e5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 19:51:26 +01:00
Laurent Destailleur
e2dc12c8fd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-10 19:50:49 +01:00
Laurent Destailleur
1292575371 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 19:50:00 +01:00
Laurent Destailleur
b513ad90eb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:33 +01:00
Laurent Destailleur
e0a12edf31 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:10 +01:00
Laurent Destailleur
0625a7194f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-01-10 19:47:32 +01:00
Laurent Destailleur
ec6e933f66 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-01-10 19:47:00 +01:00
Laurent Destailleur
e0c8ccb9fb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-01-10 19:45:35 +01:00
Laurent Destailleur
ef00cb0736 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2020-01-10 19:44:52 +01:00
Laurent Destailleur
d7f7f5bf3d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2020-01-10 19:42:34 +01:00
Laurent Destailleur
7c0a6946a7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2020-01-10 19:42:15 +01:00
Laurent Destailleur
1ecc1afa9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2020-01-10 19:41:49 +01:00
Laurent Destailleur
ceb1e699b7 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2020-01-10 19:37:16 +01:00
Laurent Destailleur
c028819cab FIX clone of purchase order 2020-01-10 19:35:49 +01:00
Laurent Destailleur
89ab80e598 Fix typo 2020-01-10 14:41:58 +01:00
Laurent Destailleur
67aa291883 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:37:11 +01:00
Laurent Destailleur
fd3d4cb2d0 Fix link 2020-01-10 14:36:52 +01:00
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/html.form.class.php
2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
ee8cc894cd Fix screenshot 2020-01-10 14:27:40 +01:00
Laurent Destailleur
b05a49b284 Fix link to screenshot 2020-01-10 14:26:18 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
efb506ba7f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
Laurent Destailleur
dd930fe791 Can disable a not expected behaviour on price propagation 2020-01-10 01:07:58 +01:00
Frédéric FRANCE
7bea60af84 can replace formconfirm in order supplier 2020-01-10 00:27:40 +01:00
Frédéric FRANCE
47ee03acdc Update odf.php 2020-01-10 00:26:46 +01:00
Frédéric FRANCE
188024339d Update choix_date.php 2020-01-10 00:25:46 +01:00
Frédéric FRANCE
f8f45be225 Update choix_autre.php 2020-01-10 00:25:42 +01:00
Frédéric FRANCE
095336f333 Update create_survey.php 2020-01-10 00:25:37 +01:00
Frédéric FRANCE
90b4a4d314 Update index.php 2020-01-10 00:25:31 +01:00
Laurent Destailleur
22b6828e09 Merge pull request #12792 from aspangaro/12.0_a5
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
940a9fc800 Merge pull request #12823 from frederic34/patch-18
add newtoken in create survey
2020-01-10 00:22:21 +01:00
Laurent Destailleur
4f2f2f0d73 Merge pull request #12815 from artis-auxilium/fix_massaction_checkbox
Fix massaction checkbox when product module disable
2020-01-10 00:22:02 +01:00
Laurent Destailleur
a378cee1e0 Merge pull request #12814 from frederic34/patch-17
Update odf.php
2020-01-10 00:19:57 +01:00