Commit Graph

86320 Commits

Author SHA1 Message Date
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master
TakePOS Auto Order improvements
2020-05-14 16:18:28 +02:00
Laurent Destailleur
bc581ead3b
Merge branch 'develop' into master 2020-05-14 16:17:37 +02:00
Laurent Destailleur
14fce7fe55 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:03:42 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00
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
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
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
DEMAREST Maxime (Indelog)
ac0b735131 Fix use date_ech for social contributions in accounting-file.php 2020-05-13 18:01:00 +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
DEMAREST Maxime (Indelog)
fcb3b112d9 Fix use datep field for various payment in accouting-files.php 2020-05-13 09:31:14 +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
andreubisquerra
8bd1179b82
Update qr.php 2020-05-12 17:03:24 +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
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
a6708009d7 Add option PROJECT_OPEN_ALWAYS_ON_TAB 2020-05-12 14:53:03 +02:00
Laurent Destailleur
e9c405182d css 2020-05-12 14:18:31 +02:00
Laurent Destailleur
c89e8efec3 responsive 2020-05-12 14:08:28 +02:00
Laurent Destailleur
e4611f2950 Fix filter on categories 2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users
NEW Add option to hide all inactive users into combo list of users.
2020-05-12 03:18:21 +02:00
Laurent Destailleur
3c8452aa31
Update admin.lang 2020-05-12 03:17:55 +02:00
Laurent Destailleur
6706d28eb7
Update admin.lang 2020-05-12 03:15:19 +02:00
Laurent Destailleur
2bf91c0f37
Merge pull request #13857 from bb2a/Link-phone-warehouse
Links phone on warehouse liste
2020-05-12 03:09:16 +02:00
Laurent Destailleur
92d137cde9
Update list.php 2020-05-12 03:09:04 +02:00