dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors of display in bank jo...
Date: Thu, 03 Dec 2015 03:59:21 -0800 
  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 337643e53e29b9862b92c6d73ce7a27975e79d02
      
https://github.com/Dolibarr/dolibarr/commit/337643e53e29b9862b92c6d73ce7a27975e79d02
  Author: aspangaro <address@hidden>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Accountancy : Correct errors of display in bank journal


  Commit: 06f752b250ff084f3d9bf9256cebf30f0d77c0d6
      
https://github.com/Dolibarr/dolibarr/commit/06f752b250ff084f3d9bf9256cebf30f0d77c0d6
  Author: aspangaro <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/comm/action/card.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/card.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/card.php
    M htdocs/product/stock/product.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy


  Commit: 9f27e2323f33e42e27fb55ddaf7dfffced77f87a
      
https://github.com/Dolibarr/dolibarr/commit/9f27e2323f33e42e27fb55ddaf7dfffced77f87a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  FIX #3734 Do not show empty links of deleted source objects in stock movement 
list


  Commit: d64664f5a78281469de67ffd95b0434dc0d7028a
      
https://github.com/Dolibarr/dolibarr/commit/d64664f5a78281469de67ffd95b0434dc0d7028a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Merge pull request #4057 from marcosgdf/bug-3734

FIX #3734 Do not show empty links of deleted source objects in stock movement 
list


  Commit: 91ce70a6e98035e8796f2953974a9ba3fe9a17f5
      
https://github.com/Dolibarr/dolibarr/commit/91ce70a6e98035e8796f2953974a9ba3fe9a17f5
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M htdocs/langs/en_US/users.lang

  Log Message:
  -----------
  FIX #4081 Added missing translation


  Commit: 973e42d10f5a70fc26f1e133f8006160c9de8169
      
https://github.com/Dolibarr/dolibarr/commit/973e42d10f5a70fc26f1e133f8006160c9de8169
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M htdocs/core/lib/date.lib.php

  Log Message:
  -----------
  FIX #4097 Public holiday calculation

The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.


  Commit: 8c0dffd24e2be2552bc8deb631832efb25e787ab
      
https://github.com/Dolibarr/dolibarr/commit/8c0dffd24e2be2552bc8deb631832efb25e787ab
  Author: aspangaro <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/modules/modCategorie.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy


  Commit: 041fa8d3f38d54be4702b2e6922c3a11bb94e341
      
https://github.com/Dolibarr/dolibarr/commit/041fa8d3f38d54be4702b2e6922c3a11bb94e341
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M htdocs/langs/en_US/users.lang

  Log Message:
  -----------
  Merge pull request #4083 from GPCsolutions/3.6-4081

FIX #4081 Added missing translation


  Commit: 9a2259c6811e76cc0771a52c18980ddefeba0c1f
      
https://github.com/Dolibarr/dolibarr/commit/9a2259c6811e76cc0771a52c18980ddefeba0c1f
  Author: aspangaro <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/core/lib/report.lib.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Correct button 'Export' and 'Write bookkeeping' on finance journal


  Commit: 37da315af64a8c41ef76d4db66da6a2515e373dc
      
https://github.com/Dolibarr/dolibarr/commit/37da315af64a8c41ef76d4db66da6a2515e373dc
  Author: aspangaro <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Remove old code


  Commit: 208bf2545fd1519c639097db6241f793a78a9adf
      
https://github.com/Dolibarr/dolibarr/commit/208bf2545fd1519c639097db6241f793a78a9adf
  Author: fmarcet <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany


  Commit: 2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
      
https://github.com/Dolibarr/dolibarr/commit/2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-28 (Sat, 28 Nov 2015)

  Changed paths:
    M htdocs/core/lib/date.lib.php

  Log Message:
  -----------
  Merge pull request #4099 from GPCsolutions/3.6-4097

FIX #4097 Public holiday calculation


  Commit: ae87a270e4414eef36e580b8df0572e14855b323
      
https://github.com/Dolibarr/dolibarr/commit/ae87a270e4414eef36e580b8df0572e14855b323
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-28 (Sat, 28 Nov 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/core/lib/report.lib.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #4101 from aspangaro/3.7-accountancy

Fix #4069 Accountancy - button "export" don't work on finance journal


  Commit: e72f4cb063533a85be39860d2341bb6942e7b60d
      
https://github.com/Dolibarr/dolibarr/commit/e72f4cb063533a85be39860d2341bb6942e7b60d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-28 (Sat, 28 Nov 2015)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge pull request #4102 from fmarcet/3.6

Fix: Bug when idprof is mandatory on thrid creation and we use multicompany


  Commit: b1122b55d464a170c0c846c20b91d1ad67e93be6
      
https://github.com/Dolibarr/dolibarr/commit/b1122b55d464a170c0c846c20b91d1ad67e93be6
  Author: aspangaro <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Fix : accountancy code on finance journal is not a constant


  Commit: bd632cf2b0205c4e7a5c08c631a088ae31986378
      
https://github.com/Dolibarr/dolibarr/commit/bd632cf2b0205c4e7a5c08c631a088ae31986378
  Author: Florian HENRY <address@hidden>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  FIX : Use "WHERE true" instead of "WHERE 1" #4132


  Commit: a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
      
https://github.com/Dolibarr/dolibarr/commit/a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Merge pull request #4123 from aspangaro/3.7-accountancy

Fix : accountancy code on finance journal is not a constant


  Commit: 1694481df88c3aad6c8e839c4b64f32aca873598
      
https://github.com/Dolibarr/dolibarr/commit/1694481df88c3aad6c8e839c4b64f32aca873598
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge pull request #4134 from FHenry/3.7

FIX : Use "WHERE true" instead of "WHERE 1" #4132


  Commit: 7105fabb799123a9f2aa144a92f02419adad7ca6
      
https://github.com/Dolibarr/dolibarr/commit/7105fabb799123a9f2aa144a92f02419adad7ca6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/core/lib/date.lib.php
    M htdocs/langs/en_US/users.lang
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        htdocs/langs/en_US/users.lang
        htdocs/product/stock/class/mouvementstock.class.php


  Commit: 12702ee128f3b0bf73bf09c18d2020002514282e
      
https://github.com/Dolibarr/dolibarr/commit/12702ee128f3b0bf73bf09c18d2020002514282e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8

Conflicts:
        htdocs/accountancy/journal/bankjournal.php
        htdocs/core/lib/report.lib.php
        htdocs/product/stock/class/mouvementstock.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/64e35255ae95...12702ee128f3
reply via email to
[Prev in Thread] Current Thread [Next in Thread]