[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 57f8f3: Correction Reset Mask (before
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 57f8f3: Correction Reset Mask (before do not work with FA{... |
Date: |
Sat, 25 Jan 2014 07:29:08 -0800 |
Branch: refs/heads/3.5_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 57f8f30494a8cecb5e68faa1f6ecbd9a2bc8ffa3
https://github.com/Dolibarr/dolibarr/commit/57f8f30494a8cecb5e68faa1f6ecbd9a2bc8ffa3
Author: Florian Henry <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Correction Reset Mask (before do not work with address@hidden with
date 2014-01-01)
Commit: 79c2e314390192370cff2bcefa79d9909bf1df38
https://github.com/Dolibarr/dolibarr/commit/79c2e314390192370cff2bcefa79d9909bf1df38
Author: Florian Henry <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Fix mask
Commit: cd84a5fd17c72496cf26d06e7ddbba9908415e4d
https://github.com/Dolibarr/dolibarr/commit/cd84a5fd17c72496cf26d06e7ddbba9908415e4d
Author: Florian Henry <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
remove debug
Commit: b8aee5f46204ee4ab42fb6a366672bb0d0640957
https://github.com/Dolibarr/dolibarr/commit/b8aee5f46204ee4ab42fb6a366672bb0d0640957
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge pull request #1388 from FHenry/3.4
Correction Reset Mask (before do not work with address@hidden with date
2014-01-01)
Commit: 8a0bddf4c5f37088694ad03cc4478e94ab4611c1
https://github.com/Dolibarr/dolibarr/commit/8a0bddf4c5f37088694ad03cc4478e94ab4611c1
Author: Grand Philippe <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
typo
Commit: 9341db3e86a75a3c9eb25389145cced770d44ed7
https://github.com/Dolibarr/dolibarr/commit/9341db3e86a75a3c9eb25389145cced770d44ed7
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Fix: Missing id
Commit: 021f6e90e2141dcc5225aaeeb05b15d0dad595cb
https://github.com/Dolibarr/dolibarr/commit/021f6e90e2141dcc5225aaeeb05b15d0dad595cb
Author: philippe <address@hidden>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Commit: eb7d802a8fe0e335dcc99c8ae024be3c8728771d
https://github.com/Dolibarr/dolibarr/commit/eb7d802a8fe0e335dcc99c8ae024be3c8728771d
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Thousand separator has been set to None instead of space
Commit: 4f5441dc81b41b452e77ff889adb37d387e22903
https://github.com/Dolibarr/dolibarr/commit/4f5441dc81b41b452e77ff889adb37d387e22903
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/comm/action/fiche.php
M htdocs/core/modules/modBarcode.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/product/class/product.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
Commit: 9e7f3686dba878ef31991de096e2a94dff0cab58
https://github.com/Dolibarr/dolibarr/commit/9e7f3686dba878ef31991de096e2a94dff0cab58
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/adherents/fiche.php
Log Message:
-----------
Fix: No message if module mailman disabled
Commit: ce24a7e9ad4b73e0e0579ee124c92be2d253bd5e
https://github.com/Dolibarr/dolibarr/commit/ce24a7e9ad4b73e0e0579ee124c92be2d253bd5e
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: Bad error management making rollback instead of commit
Commit: 4c64767e7bb0f2bca6b2d24610ec9b905c45d8e0
https://github.com/Dolibarr/dolibarr/commit/4c64767e7bb0f2bca6b2d24610ec9b905c45d8e0
Author: Juanjo Menent <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Merge pull request #1392 from atm-maxime/3.5
Thousand separator has been set to None instead of space
Commit: 35051f8c77b707df606c91374a41077b57b1ff0f
https://github.com/Dolibarr/dolibarr/commit/35051f8c77b707df606c91374a41077b57b1ff0f
Author: simnandez <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/es_ES/main.lang
Log Message:
-----------
Thousand separator must be space into Spain
Commit: f634427f73a8f7133f6b5bde8f205856f0dc25c3
https://github.com/Dolibarr/dolibarr/commit/f634427f73a8f7133f6b5bde8f205856f0dc25c3
Author: Juanjo Menent <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge pull request #1390 from grandoc/3.5
typo
Commit: cd1313280c16d17e952275bedc7b475a89c8f77f
https://github.com/Dolibarr/dolibarr/commit/cd1313280c16d17e952275bedc7b475a89c8f77f
Author: simnandez <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Fix: Bad navigation into stock product tab
Commit: 6fed307d70bc84273d6f4c203436ab961cfd7f3a
https://github.com/Dolibarr/dolibarr/commit/6fed307d70bc84273d6f4c203436ab961cfd7f3a
Author: simnandez <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/core/boxes/box_comptes.php
Log Message:
-----------
Fix: box of bank balances lines without decimals
Commit: 21d6e22f031b696e959ddd7c98bb4a5da16f66a3
https://github.com/Dolibarr/dolibarr/commit/21d6e22f031b696e959ddd7c98bb4a5da16f66a3
Author: simnandez <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
A htdocs/langs/ca_ES/link.lang
A htdocs/langs/es_ES/link.lang
Log Message:
-----------
Trad: Add missing ca_ES and es_ES files
Commit: 21b43d76041ce527662664968fae838e0b0c261b
https://github.com/Dolibarr/dolibarr/commit/21b43d76041ce527662664968fae838e0b0c261b
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M htdocs/admin/workflow.php
M htdocs/commande/fiche.php
Log Message:
-----------
Fix: if module invoice is disabled, option to automatically classify
order as billed does not exists, so "Classify billed" for order must be
done manually from order card.
Commit: 7254aecbb77ef620867dbb95f37a25d4e0441a56
https://github.com/Dolibarr/dolibarr/commit/7254aecbb77ef620867dbb95f37a25d4e0441a56
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
A htdocs/langs/ca_ES/link.lang
A htdocs/langs/es_ES/link.lang
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Commit: 7986c95ce3dc1c9e664bf5316f16f385c97a3fdb
https://github.com/Dolibarr/dolibarr/commit/7986c95ce3dc1c9e664bf5316f16f385c97a3fdb
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Fix: Error management when deleting a payment on supplier invoice.
Commit: 98805ace4aa32317b8e173a2ad3c8440e7244146
https://github.com/Dolibarr/dolibarr/commit/98805ace4aa32317b8e173a2ad3c8440e7244146
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Fix: Error management when deleting a payment on supplier invoice.
Commit: 7149fd76c7d0ba123993e7cbfc4da52b475f218c
https://github.com/Dolibarr/dolibarr/commit/7149fd76c7d0ba123993e7cbfc4da52b475f218c
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-25 (Sat, 25 Jan 2014)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/core/lib/functions2.lib.php
Commit: 12a17ec906b8bb4963f8e4cb67a49a041504e5dc
https://github.com/Dolibarr/dolibarr/commit/12a17ec906b8bb4963f8e4cb67a49a041504e5dc
Author: Laurent Destailleur <address@hidden>
Date: 2014-01-25 (Sat, 25 Jan 2014)
Changed paths:
M htdocs/adherents/fiche.php
M htdocs/admin/workflow.php
M htdocs/comm/action/fiche.php
M htdocs/commande/fiche.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/facture/fiche.php
A htdocs/langs/ca_ES/link.lang
M htdocs/langs/ca_ES/main.lang
A htdocs/langs/es_ES/link.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/main.inc.php
M htdocs/product/stock/product.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/d3a0eb2633b7...12a17ec906b8