Commit Graph

87108 Commits

Author SHA1 Message Date
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4
Update dolistore.class.php
2020-05-14 16:00:36 +02:00
Laurent Destailleur
aae1b9f7fe
Merge pull request #13873 from ptibogxiv/patch-337
Fix mailing entity
2020-05-14 16:00:04 +02:00
Laurent Destailleur
b8265d3604
Merge pull request #13878 from atm-gauthier/10.0_fix_wrong_param
FIX : wrong url param
2020-05-14 15:59:37 +02:00
Laurent Destailleur
30c167c6f4
Merge pull request #13885 from atm-maxime/fix_top_menu_search
Fix top menu search method must be GET
2020-05-14 15:58:32 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Laurent Destailleur
01525e1d3b
Merge pull request #13884 from indelog/impraccountfile
Fix and imporve some points for compta/accounting-flles.php
2020-05-14 15:48:30 +02:00
Laurent Destailleur
928ed6eecc
Merge pull request #13889 from atm-john/11.0_fix_multicompany_shared_filter
Fix multicompany supplier product price filter
2020-05-14 15:44:45 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape <
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
Laurent Destailleur
4a04cecbaa CSS 2020-05-14 14:30:22 +02:00
Laurent Destailleur
72c6aa81bb Trans 2020-05-14 14:30:15 +02:00
Laurent Destailleur
4a65b629ee Position of fields 2020-05-14 14:29:14 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape <
Better help
2020-05-14 14:10:04 +02:00
Laurent Destailleur
1bd00b0e8c Fix to solve feedbacks of
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 12:28:17 +02:00
stickler-ci
e3afa65880 Fixing style errors. 2020-05-14 09:38:27 +00:00
Anthony Berton
36b63ed921 Update list.php 2020-05-14 11:37:26 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
DEMAREST Maxime (Indelog)
ac0b735131 Fix use date_ech for social contributions in accounting-file.php 2020-05-13 18:01:00 +02:00
Frédéric FRANCE
be78ef5fb3
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-13 17:53:41 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46 Add payment loan in accounting-files.php 2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f Add total by credit/debit for accounting-file.php 2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4 Add preview file in compta/accounting-files.php 2020-05-13 15:01:32 +02:00
Laurent Destailleur
3b87b7c359 CSS 2020-05-13 13:29:50 +02:00
Laurent Destailleur
8e6efba0be CSS 2020-05-13 12:49:53 +02:00
Laurent Destailleur
9785e0b852 Trans 2020-05-13 12:30:59 +02:00
Florian Mortgat
bd3504c473 FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7 2020-05-13 10:26:44 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9 Fix use datep field for various payment in accouting-files.php 2020-05-13 09:31:14 +02:00
Maxime Kohlhaas
48183b396a Fix top menu search method must be GET 2020-05-13 08:54:42 +02:00
stickler-ci
b7ae5ffa1d Fixing style errors. 2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95 Fix and imporve some points for compta/accounting-flles.php
* Fix zip generation for accouning-files if line has no document.
  The zip file generated if $filesarray contain a line with empty 'files'
  was unsustainable because it try to add empty files.

* Add clickable link to jump on card for other line than Invoice and
  Supplier Invoice

* Add various payment

* Use label as ref for paiements of salaries line to display more explicit line
2020-05-13 08:00:06 +02:00
Laurent Destailleur
ebbd4413f5 Fix scrutinizer error 2020-05-13 00:47:27 +02:00
Laurent Destailleur
f0d14662b9 Fix scrutinizer 2020-05-13 00:38:12 +02:00
Laurent Destailleur
22301d63d8 Replace a ZEND phpcs rule with a PSR2 rule 2020-05-13 00:35:10 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
Laurent Destailleur
63d6b3c47d Look and feel v12 2020-05-12 23:44:50 +02:00
Laurent Destailleur
410694100d CSS 2020-05-12 23:42:01 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php 2020-05-12 18:44:26 +02:00
Frédéric FRANCE
39ae11efa3
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-12 18:02:52 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
andreubisquerra
8bd1179b82
Update qr.php 2020-05-12 17:03:24 +02:00
ptibogxiv
70ea77ce8f
Update list.php 2020-05-12 15:37:37 +02:00
ptibogxiv
f837bf043a
Update shipment.php 2020-05-12 15:34:48 +02:00
ptibogxiv
ce9b841d9f
Update shipment.php 2020-05-12 15:33:25 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00