[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ba70c1: Fix: typo on debian files
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ba70c1: Fix: typo on debian files |
Date: |
Mon, 15 Sep 2014 13:53:25 -0700 |
Branch: refs/heads/3.6
Home: https://github.com/Dolibarr/dolibarr
Commit: ba70c1a08a8793b773729e9e87e9444b5a64623b
https://github.com/Dolibarr/dolibarr/commit/ba70c1a08a8793b773729e9e87e9444b5a64623b
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M build/debian/control
M build/debian/get-orig-source.sh
Log Message:
-----------
Fix: typo on debian files
Commit: 949ae2f160caf39293fd55918f31ca76c5a11c05
https://github.com/Dolibarr/dolibarr/commit/949ae2f160caf39293fd55918f31ca76c5a11c05
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having
permission to read them
Commit: 74e16db6321a27b4d064af12bb8ef8d2860c8cf3
https://github.com/Dolibarr/dolibarr/commit/74e16db6321a27b4d064af12bb8ef8d2860c8cf3
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/admin/menus/edit.php
Log Message:
-----------
[ bug #1589 ] Menu type in "Edit menu" page is not translated
Commit: afd631e6e3aa2d36b5af62fc30b0ac6e9d5a9321
https://github.com/Dolibarr/dolibarr/commit/afd631e6e3aa2d36b5af62fc30b0ac6e9d5a9321
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
[ bug #1577 ] When creating new Private individual third, selected third type
is ignored
Commit: 7a28f8e4aaf009ae5354565140abdc8d471d2dc4
https://github.com/Dolibarr/dolibarr/commit/7a28f8e4aaf009ae5354565140abdc8d471d2dc4
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
Log Message:
-----------
[ bug #1555 ] Update accountancy code of products does not throw
PRODUCT_MODIFY trigger
Commit: 9426298b95db766c055bfb39f5e10ebb9990eac9
https://github.com/Dolibarr/dolibarr/commit/9426298b95db766c055bfb39f5e10ebb9990eac9
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/paiement/fiche.php
Log Message:
-----------
[ bug #1548 ] Supplier payment card shows type in French
Commit: 7bac9444e6ef77517905b231a2f81c13efd3d05d
https://github.com/Dolibarr/dolibarr/commit/7bac9444e6ef77517905b231a2f81c13efd3d05d
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/bank/account.php
Log Message:
-----------
[ bug #1546 ] Incorrect page number when searching in the list of bank
transactions
Commit: 3daaaadf6542d0d3fa3087aeceed6639da37527d
https://github.com/Dolibarr/dolibarr/commit/3daaaadf6542d0d3fa3087aeceed6639da37527d
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge pull request #1880 from marcosgdf/bug-1591
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having
permission to read them
Commit: fcbb388a72e7ce9fe12a900669435b236e09ede8
https://github.com/Dolibarr/dolibarr/commit/fcbb388a72e7ce9fe12a900669435b236e09ede8
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/admin/menus/edit.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1589' into 3.5
Commit: f0d4ebe41704e8e1c3f7a35aa6f8fb774a4828bf
https://github.com/Dolibarr/dolibarr/commit/f0d4ebe41704e8e1c3f7a35aa6f8fb774a4828bf
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 2704f50bd4e5bc26de52ac45aefd529a4343a34a
https://github.com/Dolibarr/dolibarr/commit/2704f50bd4e5bc26de52ac45aefd529a4343a34a
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1577
Conflicts:
ChangeLog
Commit: 85338bacb4cac3ba8d41ccf943396f0215fe932c
https://github.com/Dolibarr/dolibarr/commit/85338bacb4cac3ba8d41ccf943396f0215fe932c
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1577' into 3.5
Commit: ef99de4e843e67bc343a6fcec84255ab7ae6c185
https://github.com/Dolibarr/dolibarr/commit/ef99de4e843e67bc343a6fcec84255ab7ae6c185
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch 'bug-1555' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1555
Conflicts:
ChangeLog
Commit: e93d4743936679cbb938c29516f43555a820e569
https://github.com/Dolibarr/dolibarr/commit/e93d4743936679cbb938c29516f43555a820e569
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1555' into 3.5
Commit: 822a3ebe7ef03ce7f624df0713c52646648a2480
https://github.com/Dolibarr/dolibarr/commit/822a3ebe7ef03ce7f624df0713c52646648a2480
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/paiement/fiche.php
Log Message:
-----------
Merge branch 'bug-1548' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1548
Conflicts:
ChangeLog
Commit: e8758bc19bbeeb002cf84912c72aeb2f8f6e4760
https://github.com/Dolibarr/dolibarr/commit/e8758bc19bbeeb002cf84912c72aeb2f8f6e4760
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/paiement/fiche.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1548' into 3.5
Commit: c4facf20e620f2929940e7cc2fced98270a31474
https://github.com/Dolibarr/dolibarr/commit/c4facf20e620f2929940e7cc2fced98270a31474
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/bank/account.php
Log Message:
-----------
Merge branch 'bug-1546' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1546
Conflicts:
ChangeLog
Commit: 0dcd41ff019b6a64bd117ac69dbea5fb6407b887
https://github.com/Dolibarr/dolibarr/commit/0dcd41ff019b6a64bd117ac69dbea5fb6407b887
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/bank/account.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1546' into 3.5
Commit: d812262ed834a0c5813dd7ac3f31cf6d1dcf4e24
https://github.com/Dolibarr/dolibarr/commit/d812262ed834a0c5813dd7ac3f31cf6d1dcf4e24
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
A htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
Log Message:
-----------
Fix: Missing source
Commit: 76ba3301c3041cca2c3cb1cbcdf8341b30aebb22
https://github.com/Dolibarr/dolibarr/commit/76ba3301c3041cca2c3cb1cbcdf8341b30aebb22
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M build/debian/copyright
Log Message:
-----------
Fix: Syntax for license key
Commit: 05f3a47018114385a59c427d10c08e4743a1f3f5
https://github.com/Dolibarr/dolibarr/commit/05f3a47018114385a59c427d10c08e4743a1f3f5
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M ChangeLog
M build/debian/control
M build/debian/copyright
M build/debian/get-orig-source.sh
M htdocs/admin/menus/edit.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/paiement/fiche.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/9c70c2c3d0a7...05f3a4701811