Laurent Destailleur
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
fdfc45bbe9
|
Fix wrapping
|
2020-02-05 15:04:11 +01:00 |
|
Laurent Destailleur
|
a2bb64354b
|
Fix bad merge
|
2020-02-05 14:56:01 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
Laurent Destailleur
|
1fe9783760
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/product/index.php
|
2020-02-05 14:38:19 +01:00 |
|
Laurent Destailleur
|
9515467300
|
Merge pull request #13005 from RubenRuCh/11.0
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-05 14:30:40 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
andreubisquerra
|
220f02805d
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
|
2020-02-05 14:12:29 +01:00 |
|
Laurent Destailleur
|
320dd69923
|
Merge pull request #13002 from andreubisquerra/develop
Update image path after move image directory
|
2020-02-05 14:10:12 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
Laurent Destailleur
|
8051e916c0
|
Merge pull request #13017 from andreubisquerra/develop
Add bold tags to Receipt Printers module
|
2020-02-05 12:40:07 +01:00 |
|
Laurent Destailleur
|
63ba601906
|
Update box_project.php
|
2020-02-05 12:39:00 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
Pierre Ardoin
|
81ed70ffc7
|
Update box_project.php
|
2020-02-05 09:18:39 +01:00 |
|
Pierre Ardoin
|
d5b74a8ca3
|
Update box_project.php
|
2020-02-05 09:06:43 +01:00 |
|
Pierre Ardoin
|
262d889700
|
Update box_project.php
|
2020-02-05 08:50:51 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|
Laurent Destailleur
|
bc19f72306
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:20 +01:00 |
|
Laurent Destailleur
|
bb1c9a66dd
|
Fix code alignement on modulebuilder
|
2020-02-04 16:37:30 +01:00 |
|
Laurent Destailleur
|
976ce0a954
|
Fix scrutinizer
|
2020-02-04 14:33:25 +01:00 |
|
Laurent Destailleur
|
157745a1bb
|
Fix phpcs
|
2020-02-04 14:18:37 +01:00 |
|
AdrianDominik
|
4695172028
|
Merge remote-tracking branch 'upstream/11.0' into 11.0
|
2020-02-04 11:40:37 +01:00 |
|
Pierre Ardoin
|
d93a597a1e
|
Fix Compatbility with Multicompany
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
|
2020-02-04 09:17:02 +01:00 |
|
Laurent Destailleur
|
c367c6f34e
|
Avoid warning
|
2020-02-03 21:17:45 +01:00 |
|
andreubisquerra
|
e6dc384ee9
|
Add bold tags
|
2020-02-03 19:33:23 +01:00 |
|
stickler-ci
|
5dcd5e5b87
|
Fixing style errors.
|
2020-02-03 09:54:35 +01:00 |
|
AdrianDominik
|
ed269a387f
|
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-03 09:54:34 +01:00 |
|
Laurent Destailleur
|
97d726733c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/includes/tecnickcom/tcpdf/tcpdf.php
|
2020-02-03 06:36:43 +01:00 |
|
Laurent Destailleur
|
d8ed62ea33
|
Fix line_max for BOM
|
2020-02-03 06:28:51 +01:00 |
|
Laurent Destailleur
|
e5808e3335
|
FIX #12995
|
2020-02-03 04:48:17 +01:00 |
|
Laurent Destailleur
|
7c35e9aaa8
|
FIX #12932
|
2020-02-03 03:56:30 +01:00 |
|
Laurent Destailleur
|
1dab308e4a
|
FIX #12932
|
2020-02-03 03:55:37 +01:00 |
|
Laurent Destailleur
|
37617bbce8
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-03 03:48:27 +01:00 |
|
Laurent Destailleur
|
5633f58477
|
FIX #12978
|
2020-02-03 03:25:41 +01:00 |
|
Laurent Destailleur
|
ccf8e81f93
|
FIX #12975
|
2020-02-03 03:10:10 +01:00 |
|
Laurent Destailleur
|
ff6bcbdcf8
|
Fix trans
|
2020-02-03 03:10:03 +01:00 |
|
Laurent Destailleur
|
240727c3e1
|
FIX #12975
|
2020-02-03 03:08:54 +01:00 |
|
Laurent Destailleur
|
3f73339818
|
Fix trans
|
2020-02-03 03:01:23 +01:00 |
|
Laurent Destailleur
|
fc47fa5ec3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/projet/element.php
|
2020-02-03 02:58:45 +01:00 |
|
Laurent Destailleur
|
8098456f67
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-03 02:52:46 +01:00 |
|
andreubisquerra
|
a4c1c00728
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
|
2020-02-02 21:02:43 +01:00 |
|
Laurent Destailleur
|
12b63606df
|
Fix look and feel of v11
|
2020-02-02 20:21:16 +01:00 |
|
Laurent Destailleur
|
21e4717721
|
Merge pull request #12983 from atm-quentin/NEW_monthly_view
NEW monthly view to enter time
|
2020-02-02 20:05:18 +01:00 |
|
Laurent Destailleur
|
86c1777702
|
Merge pull request #12976 from mapiolca/patch-28
Add support of Number2Words module (v2)
|
2020-02-02 19:54:49 +01:00 |
|
Laurent Destailleur
|
7cb2c21dc2
|
FIX #12974
|
2020-02-02 19:50:53 +01:00 |
|
Laurent Destailleur
|
ffa847bc8e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-02 19:32:37 +01:00 |
|
Laurent Destailleur
|
075b1ea744
|
FIX Log of authentication ko or ko + CVE-2020-7996
|
2020-02-02 19:05:38 +01:00 |
|
Laurent Destailleur
|
4765198af2
|
Clean code from using deprecated field amount
|
2020-02-02 19:03:37 +01:00 |
|
Laurent Destailleur
|
aa54aaeb01
|
FIX search filter on extrafields were not restored avec "Back to list"
|
2020-01-31 19:46:03 +01:00 |
|