[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fdac53: Update objectline_create.tpl.
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fdac53: Update objectline_create.tpl.php |
|
Date: |
Thu, 27 Nov 2014 17:27:10 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: fdac53bfca37b034a8decfb4f0e568cbc93a5b27
https://github.com/Dolibarr/dolibarr/commit/fdac53bfca37b034a8decfb4f0e568cbc93a5b27
Author: BENKE Charles <address@hidden>
Date: 2014-11-19 (Wed, 19 Nov 2014)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Update objectline_create.tpl.php
add label tags for product mode type
Commit: 7a272afd120029ba06d00ff6d56d7a8e129cbb8f
https://github.com/Dolibarr/dolibarr/commit/7a272afd120029ba06d00ff6d56d7a8e129cbb8f
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/fichinter/fiche.php
Log Message:
-----------
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation
page, does not save state
Commit: dcfaeb6606657471e63100a50694fb08c1e3eac1
https://github.com/Dolibarr/dolibarr/commit/dcfaeb6606657471e63100a50694fb08c1e3eac1
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/class/product.class.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.6' into 3.6
Commit: 375d9aa33650f6c396ee1ae0166f33535bda12bf
https://github.com/Dolibarr/dolibarr/commit/375d9aa33650f6c396ee1ae0166f33535bda12bf
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/fichinter/fiche.php
Log Message:
-----------
Merge pull request #2077 from marcosgdf/3.6
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page,
does not save state
Commit: 1dbb19e8ef4a9b6ee76241eb61238253496e337c
https://github.com/Dolibarr/dolibarr/commit/1dbb19e8ef4a9b6ee76241eb61238253496e337c
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #2058 from defrance69/patch-30
Update objectline_create.tpl.php
Commit: 5dbba380d230e23adda0e6e074cf8e811dff5224
https://github.com/Dolibarr/dolibarr/commit/5dbba380d230e23adda0e6e074cf8e811dff5224
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix 1721 Missing translation on proposal creation
Commit: 655dc35628e7da518eac53f3c92344f1311550cb
https://github.com/Dolibarr/dolibarr/commit/655dc35628e7da518eac53f3c92344f1311550cb
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/admin/propal.php
Log Message:
-----------
Update propal.php
Commit: 81f467661e9f941aa3ad8074df1ca8aff2c8b566
https://github.com/Dolibarr/dolibarr/commit/81f467661e9f941aa3ad8074df1ca8aff2c8b566
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Update propal.php
Commit: f5bc6dc6343f503019eb2a59ebba6343c3dee6f8
https://github.com/Dolibarr/dolibarr/commit/f5bc6dc6343f503019eb2a59ebba6343c3dee6f8
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/admin/propal.php
Log Message:
-----------
Update propal.php
Commit: 9d813b25d96254c5b90e472790639ca15abd87a6
https://github.com/Dolibarr/dolibarr/commit/9d813b25d96254c5b90e472790639ca15abd87a6
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_permonth.php
Log Message:
-----------
Fix Typo
Commit: 6163635d7cb77d781da8bacd61fae363c9849c50
https://github.com/Dolibarr/dolibarr/commit/6163635d7cb77d781da8bacd61fae363c9849c50
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
Log Message:
-----------
Fix Typo
Commit: 9fb58e06f6585a008a675d033bff74aabbcf265f
https://github.com/Dolibarr/dolibarr/commit/9fb58e06f6585a008a675d033bff74aabbcf265f
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_orders_permonth.php
Log Message:
-----------
Fix Typo
Commit: e4517ee0f4d96cc382bad3990ce2ed46eacb146d
https://github.com/Dolibarr/dolibarr/commit/e4517ee0f4d96cc382bad3990ce2ed46eacb146d
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
Log Message:
-----------
Fix Typo
Commit: 911f9c0913ec614e257c209a47a5fb80caa68d73
https://github.com/Dolibarr/dolibarr/commit/911f9c0913ec614e257c209a47a5fb80caa68d73
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_propales_permonth.php
Log Message:
-----------
Fix Typo
Commit: 18406fc550d68bb5e851e242b6f928327bbe1a20
https://github.com/Dolibarr/dolibarr/commit/18406fc550d68bb5e851e242b6f928327bbe1a20
Author: Francis Appels <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
Commit: fbdd8518751c34564ef4e6a389e16920e4377bda
https://github.com/Dolibarr/dolibarr/commit/fbdd8518751c34564ef4e6a389e16920e4377bda
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Fix remove </a> not needed
Commit: b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
https://github.com/Dolibarr/dolibarr/commit/b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
Author: Francis Appels <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
Commit: 5a97ee1f951f74df1275fd4881191fe653196a75
https://github.com/Dolibarr/dolibarr/commit/5a97ee1f951f74df1275fd4881191fe653196a75
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Rearrange Help Block in left menu
Commit: f36a30f9fe7986906cd5cee73234ba56d734582d
https://github.com/Dolibarr/dolibarr/commit/f36a30f9fe7986906cd5cee73234ba56d734582d
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fixed: W3C. An id must be unique inside a page.
Commit: 3af6e048e51cbda982672c3d4b04c76a73a6bcd9
https://github.com/Dolibarr/dolibarr/commit/3af6e048e51cbda982672c3d4b04c76a73a6bcd9
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #2101 from frederic34/patch-8
Fix remove </a> not needed
Commit: 6843bfcc15e043e1787a933162fb3972041efd57
https://github.com/Dolibarr/dolibarr/commit/6843bfcc15e043e1787a933162fb3972041efd57
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix typo
Commit: db5fb1ad9ea521964a45de116218c248dc7a486c
https://github.com/Dolibarr/dolibarr/commit/db5fb1ad9ea521964a45de116218c248dc7a486c
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 4be9730518471568abb529ae9a4ef653d95a81ec
https://github.com/Dolibarr/dolibarr/commit/4be9730518471568abb529ae9a4ef653d95a81ec
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #2099 from fappels/3.6
Fix: Show sender Country on PDF docs
Commit: 61889d2195155bf4c3f0954955f42a4905284fa2
https://github.com/Dolibarr/dolibarr/commit/61889d2195155bf4c3f0954955f42a4905284fa2
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_propales_permonth.php
Log Message:
-----------
Merge pull request #2096 from frederic34/patch-7
Fix Typo
Commit: 631a98c322b56c255b658c46bb4ad445578e6bbf
https://github.com/Dolibarr/dolibarr/commit/631a98c322b56c255b658c46bb4ad445578e6bbf
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
Log Message:
-----------
Merge pull request #2095 from frederic34/patch-6
Fix Typo
Commit: b21171303a948bcdc34aaa21637f312b20448005
https://github.com/Dolibarr/dolibarr/commit/b21171303a948bcdc34aaa21637f312b20448005
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_orders_permonth.php
Log Message:
-----------
Merge pull request #2094 from frederic34/patch-5
Fix Typo
Commit: 02d53aa26ffaf28a11849434ba71ec46778a3c12
https://github.com/Dolibarr/dolibarr/commit/02d53aa26ffaf28a11849434ba71ec46778a3c12
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
Log Message:
-----------
Merge pull request #2093 from frederic34/patch-4
Fix Typo
Commit: ae6f458a98d57c79892e5e4241dc1a9bf17c2c9a
https://github.com/Dolibarr/dolibarr/commit/ae6f458a98d57c79892e5e4241dc1a9bf17c2c9a
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_permonth.php
Log Message:
-----------
Merge pull request #2092 from frederic34/patch-2
Fix Typo
Commit: f9953d52f6d9733aff0f5a3df6d7d3b883f0102e
https://github.com/Dolibarr/dolibarr/commit/f9953d52f6d9733aff0f5a3df6d7d3b883f0102e
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/admin/propal.php
M htdocs/comm/propal.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #2091 from frederic34/patch-3
Fix 1721 Missing translation on proposal creation
Commit: dc1c98734eabb12e6edbe3426064b0a80c0bcda4
https://github.com/Dolibarr/dolibarr/commit/dc1c98734eabb12e6edbe3426064b0a80c0bcda4
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/admin/propal.php
M htdocs/comm/propal.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fixed: Option specific to a module should start with module name
Commit: 232921a5061e0a723f8fbe065058fb73044e9b3c
https://github.com/Dolibarr/dolibarr/commit/232921a5061e0a723f8fbe065058fb73044e9b3c
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/commande/card.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
Fixed: Add option on a not common new feature
Commit: 38062177d328476eccbfcc64473a9b69f5268954
https://github.com/Dolibarr/dolibarr/commit/38062177d328476eccbfcc64473a9b69f5268954
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Doxygen
Commit: 491aef72e06d8692008f4c9fc9e38401bec43909
https://github.com/Dolibarr/dolibarr/commit/491aef72e06d8692008f4c9fc9e38401bec43909
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
More phpunit tests
Commit: 0a0e0e068cb49290bc882a7390d307f98bf8eb4b
https://github.com/Dolibarr/dolibarr/commit/0a0e0e068cb49290bc882a7390d307f98bf8eb4b
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/holiday/define_holiday.php
M htdocs/langs/en_US/holiday.lang
Log Message:
-----------
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
Commit: 5cc015268e410f85620877bf69d248b8d87f92d3
https://github.com/Dolibarr/dolibarr/commit/5cc015268e410f85620877bf69d248b8d87f92d3
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/fourn/commande/list.php
Log Message:
-----------
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
Commit: 79c8980493f60d84221063f7849b93233a1be967
https://github.com/Dolibarr/dolibarr/commit/79c8980493f60d84221063f7849b93233a1be967
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix: function at wrong place
Commit: 1c16a2e621558e1ce82c716e79f5d50cc7987253
https://github.com/Dolibarr/dolibarr/commit/1c16a2e621558e1ce82c716e79f5d50cc7987253
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/contrat/card.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Fixed [ bug #1642 ]: add a free line in contract
Commit: 9ba5e9434d4a322fba1eed59d3ff20fb4e120507
https://github.com/Dolibarr/dolibarr/commit/9ba5e9434d4a322fba1eed59d3ff20fb4e120507
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/projet/card.php
M htdocs/societe/soc.php
Log Message:
-----------
Fix: W3C a label must be used if there is an "input" field only. Also it
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
Commit: df9a6dae6c438bffba4726802b579743910a014b
https://github.com/Dolibarr/dolibarr/commit/df9a6dae6c438bffba4726802b579743910a014b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
Commit: a724c3aa70097c2dabdb8dbf104f817a8f0ea8f3
https://github.com/Dolibarr/dolibarr/commit/a724c3aa70097c2dabdb8dbf104f817a8f0ea8f3
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/admin/propal.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/index.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/commande/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/main.inc.php
M htdocs/projet/card.php
M htdocs/societe/soc.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/main.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/06894a196cdf...a724c3aa7009