Commit Graph

90443 Commits

Author SHA1 Message Date
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +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
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
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
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
Laurent Destailleur
a514c20183 Add warning if we try to add a task on a draft project 2020-10-12 12:53:57 +02:00
Laurent Destailleur
1538823b4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-12 12:34:18 +02:00
Laurent Destailleur
d831edb481 Fix bad popup 2020-10-12 12:33:58 +02:00
Florian HENRY
a054a27090 fix unit usage into BOM line 2020-10-12 12:23:47 +02:00
Laurent Destailleur
77bdbb01ee Merge pull request #14986 from Dolibarr/12.0
Non admin account can create an email template for other user
2020-10-12 12:16:31 +02:00
Laurent Destailleur
bf458215c1 Merge branch 'develop' into 12.0 2020-10-12 12:14:39 +02:00
Florian HENRY
c3a900a41c need to update packaging quantity 2020-10-12 11:44:12 +02:00
Laurent Destailleur
45e2a6409e Missing field 2020-10-12 11:30:53 +02:00
Florian HENRY
cea6eb279f add immport packaging supplier quantity 2020-10-12 11:26:09 +02:00
Florian HENRY
1f6a99e361 Merge github.com:Dolibarr/dolibarr into dev_finish_packingfeature 2020-10-12 11:11:23 +02:00
Florian HENRY
df4b208de1 fix: add missing edit field with pakaging option on 2020-10-12 11:10:49 +02:00
Alexandre SPANGARO
dd7415c937 Revert dol_fiche_head 2020-10-12 11:00:04 +02:00
Alexandre SPANGARO
873cf24641 FIX Show accounting account in supplier invoice when line is binded 2020-10-12 10:39:37 +02:00
Florian HENRY
371edd3052 Merge github.com:Dolibarr/dolibarr into develop 2020-10-12 09:43:01 +02:00
Florian HENRY
042b3f1843 fix donation payment with autocomplete 2020-10-12 09:42:35 +02:00
Laurent Destailleur
e2848fd229 Merge pull request #14980 from aspangaro/13a22
FIX #14956 Add a possibility to modify date on credit note invoice
2020-10-11 13:35:31 +02:00
Laurent Destailleur
920b31140b Fix exclude of backup files when path are for Windows 2020-10-11 13:32:50 +02:00
Laurent Destailleur
86c46bbb97 Fix backup - Exclude existing backup when path is uppercase. 2020-10-11 13:18:16 +02:00