Commit Graph

72281 Commits

Author SHA1 Message Date
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
2020-01-15 12:08:07 +01:00
Laurent Destailleur
4066de94b6
Merge pull request #12848 from atm-ph/fix_11.0_colum_type
Fix column type to be as llx_facture
2020-01-15 12:05:54 +01:00
Laurent Destailleur
610655333d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-15 11:56:58 +01:00
Laurent Destailleur
c8ff847480 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
Laurent Destailleur
54fa476d1a
Merge pull request #12842 from aspangaro/11.0_p3
FIX : Loan Look & feel v11
2020-01-15 11:45:06 +01:00
Laurent Destailleur
14d59f43af Trans 2020-01-15 11:33:02 +01:00
atm-ph
a088c78279 Fix column type to be as llx_facture 2020-01-15 09:52:12 +01:00
Alexandre SPANGARO
96674b2a7e FIX : Look & feel v11 2020-01-13 21:19:32 +01:00
Anthony Berton
1eff733e1c
Update functions.lib.php 2020-01-13 18:23:50 +01:00
Laurent Destailleur
e2e06b47ff FIX #12617 2020-01-13 15:58:03 +01:00
Laurent Destailleur
56fb6dce61 FIX #12756 2020-01-13 15:38:46 +01:00
Laurent Destailleur
9d4e1a3941 FIX #12797 2020-01-13 14:25:48 +01:00
Laurent Destailleur
b6ed6df75d Remove property tha has no sense in output #12803 2020-01-13 14:14:51 +01:00
Laurent Destailleur
9ceec670b9 Fix date format in FEC export 2020-01-13 13:52:48 +01:00
Laurent Destailleur
61d60ce38e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-13 13:35:41 +01:00
Laurent Destailleur
ccdee44ed1 Look and feel v11 2020-01-13 13:35:29 +01:00
Laurent Destailleur
f94b3e55b9
Merge pull request #12768 from atm-maxime/fix_loan_currency2
Remove € + unsed code and file
2020-01-13 13:19:14 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1 Fix translation of \n and \\s into language files. 2020-01-13 13:11:25 +01:00
Laurent Destailleur
adeed186bb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-13 12:34:28 +01:00
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
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
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
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
Laurent Destailleur
89ab80e598 Fix typo 2020-01-10 14:41:58 +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
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft
FIX drafts are now implemented for stats
2020-01-10 00:15:13 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior
Fix folder rename behavior
2020-01-10 00:11:47 +01:00
Laurent Destailleur
91078d6d0f
Merge pull request #12822 from laudeco/hotfix/barcode-initiator
fix the init of the barcode
2020-01-10 00:07:38 +01:00
Laurent Destailleur
3916c53337
Update codeinit.php 2020-01-10 00:07:26 +01:00
Laurent Destailleur
78dcf91f02 Fix bad link 2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
f9262b0dcf Transifex sync 2020-01-09 22:30:00 +01:00
Laurent Destailleur
c6c321b004 Fix website when ckeditor is off 2020-01-09 17:28:08 +01:00