Commit Graph

91287 Commits

Author SHA1 Message Date
stickler-ci
dcd8a88e72 Fixing style errors. 2020-10-13 13:28:23 +00:00
Sekan, Tobias
f28e1dc4fb cleanup 2020-10-13 15:27:42 +02:00
Regis Houssin
0407ab013c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-10-13 15:09:54 +02:00
Sekan, Tobias
dfff32f239 Selectable columns on sales tax list 2020-10-13 15:09:25 +02:00
Laurent Destailleur
805fa00422 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 15:09:24 +02:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Regis Houssin
00ee1a7433 FIX compatibility with LF (Line Feed) 2020-10-13 15:08:43 +02:00
Laurent Destailleur
f1f1f2b9c8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:34 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
Laurent Destailleur
029cc3734a
Merge pull request #15004 from hregis/develop_timestamp
FIX update dolibarr.pl for Virtualmin
2020-10-13 15:03:39 +02:00
Laurent Destailleur
98a4356e7c
Merge pull request #15005 from orebd/develop
FIX unkwown column tms in llx_ecm_files.sql #14947
2020-10-13 15:02:29 +02:00
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +02:00
davidNDU
43a029ef2f Model Builder template/class/myobject.class.php faulty SQL statement 2020-10-13 15:59:50 +03:00
Regis Houssin
1348c03ca0 FIX avoid spaces in file name 2020-10-13 14:46:17 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947 2020-10-13 12:10:06 +02:00
Regis Houssin
dded02ebbf FIX update dolibarr.pl for Virtualmin 2020-10-13 12:06:28 +02:00
Laurent Destailleur
85f15b5f69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 11:52:34 +02:00
Laurent Destailleur
969ed4acc1 Better label for status schedule of cron tasks. 2020-10-13 11:52:20 +02:00
Laurent Destailleur
32fe8a37b4
Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList
NEW Select-able columns on social taxes list
2020-10-13 11:11:06 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master
NEW: Add third order printer to TakePOS
2020-10-13 11:03:41 +02:00
Laurent Destailleur
4f28b3e7ff
Merge pull request #15003 from grandoc/new_branch_13_10_2020
fix Call to undefined method Form::formTransportMode()
2020-10-13 11:03:11 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Philippe GRAND
d66a1ac350 fix Call to undefined method Form::formTransportMode() 2020-10-13 10:05:44 +02:00
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
57702a1fb1 Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9 2020-10-12 20:47:32 +02:00
Laurent Destailleur
e00cf0d37c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-12 19:40:13 +02:00
Laurent Destailleur
042a9f3efe Fix missing newtoken() 2020-10-12 19:39:54 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020
fix : undefined index
2020-10-12 19:37:37 +02:00
Laurent Destailleur
ff8f4c46d9
Merge pull request #14996 from Givriz/dev
Fix : correction de commentaires
2020-10-12 19:37:03 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Damien BENOIT
276783a709
Essai de revalidation
Une ligne n'était pas synchronisée avec le projet upstream.
2020-10-12 18:36:13 +02:00
Givriz
d158716ccc Fix : correction de commentaires
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais). Il reste beaucoup à faire, mais je fais un premier PR pour vérifier que cela marche.
2020-10-12 17:41:03 +02:00
Philippe GRAND
4da75c4251 fix : undefined index 2020-10-12 16:11:56 +02:00
Laurent Destailleur
ad461a098b Fix look and feel 2020-10-12 14:06:19 +02:00
stickler-ci
675b1e613b Fixing style errors. 2020-10-12 12:05:38 +00:00
Laurent Destailleur
f468c61df3 Fix More powerfull detection of bad use of newToken 2020-10-12 14:04:34 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Sekan, Tobias
3b905bdcd5 Selectable columns on social taxes list 2020-10-12 14:00:33 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
9d2b383864
Merge pull request #14987 from FHenry/develop
fix : add missing Autocomplete payment amount "arrow" donnation payment
2020-10-12 13:07:09 +02:00
Laurent Destailleur
9eb45c500f
Merge pull request #14988 from aspangaro/13a24
FIX Show accounting account in supplier invoice when line is binded
2020-10-12 13:06:34 +02:00
Laurent Destailleur
b27c95bab0
Merge pull request #14989 from FHenry/dev_finish_packingfeature
fix : finish packging feature (allow to edit packaging quantity)
2020-10-12 13:05:34 +02:00
Laurent Destailleur
3805a7877b
Update fournisseurs.php 2020-10-12 13:05:18 +02:00
Laurent Destailleur
a1dd922394
Update modProduct.class.php 2020-10-12 13:04:10 +02:00
Laurent Destailleur
a1c01b6408
Merge pull request #14991 from FHenry/dev_fixBOM_withunit_feature
Dev fix bom with PRODUCT USE UNIT feature
2020-10-12 12:55:00 +02:00