[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0d8447: Merge branch 'develop' of htt
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0d8447: Merge branch 'develop' of https://github.com/wdamm... |
Date: |
Tue, 12 Feb 2019 16:05:51 +0000 (UTC) |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 0d8447ad3918c41a248cbbbecafb8e9d4c745710
https://github.com/Dolibarr/dolibarr/commit/0d8447ad3918c41a248cbbbecafb8e9d4c745710
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/core/modules/fichinter/modules_fichinter.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
Commit: fb5466fca0c1b54e4bb1e0293ec24ea6fdc3de46
https://github.com/Dolibarr/dolibarr/commit/fb5466fca0c1b54e4bb1e0293ec24ea6fdc3de46
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M dev/setup/codesniffer/ruleset.xml
Log Message:
-----------
Fix remove bad rule
Commit: d134e18db6014237fd77a8c709a8cf357fdf23cd
https://github.com/Dolibarr/dolibarr/commit/d134e18db6014237fd77a8c709a8cf357fdf23cd
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/paiement/list.php
M htdocs/compta/resultat/index.php
M htdocs/compta/resultat/result.php
M htdocs/compta/salaries/list.php
M htdocs/compta/salaries/stats/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/stats/byratecountry.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/clients.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 0bb59bf6ccc7aa1a556d4506c676381b931522fa
https://github.com/Dolibarr/dolibarr/commit/0bb59bf6ccc7aa1a556d4506c676381b931522fa
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix phpcs
Commit: 25550959e3d3a84bcbf3a1c667626afcdc532b58
https://github.com/Dolibarr/dolibarr/commit/25550959e3d3a84bcbf3a1c667626afcdc532b58
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/margin/agentMargins.php
Log Message:
-----------
Fix phpcs
Compare:
https://github.com/Dolibarr/dolibarr/compare/3d3aca804fd3...25550959e3d3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 0d8447: Merge branch 'develop' of https://github.com/wdamm...,
Laurent Destailleur <=