[Dolibarr-git] [Dolibarr/dolibarr] 75dbcf: Fixed: doxygen

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 75dbcf: Fixed: doxygen

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 75dbcf: Fixed: doxygen
Date:	Sun, 18 Jan 2015 06:37:25 -0800
  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 75dbcf4a78048a067cfeb4e16fcdce4f1dfb46a0
      
https://github.com/Dolibarr/dolibarr/commit/75dbcf4a78048a067cfeb4e16fcdce4f1dfb46a0
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-26 (Fri, 26 Dec 2014)

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

  Log Message:
  -----------
  Fixed: doxygen


  Commit: d40229e9cc87e706e533b07de90ce0f7ee9a29ec
      
https://github.com/Dolibarr/dolibarr/commit/d40229e9cc87e706e533b07de90ce0f7ee9a29ec
  Author: Juanjo Menent <address@hidden>
  Date:   2014-12-26 (Fri, 26 Dec 2014)

  Changed paths:
    M htdocs/product/stats/facture.php

  Log Message:
  -----------
  Fix: Bad order field value


  Commit: 953e736a97d2aacad8962b998d49db0f89aa4c7e
      
https://github.com/Dolibarr/dolibarr/commit/953e736a97d2aacad8962b998d49db0f89aa4c7e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-27 (Sat, 27 Dec 2014)

  Changed paths:
    M build/debian/changelog
    A build/exe/doliwamp/.gitignore
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare version 3.6.2


  Commit: c7937a9962808b70efa878b4a1d8262ec790ba32
      
https://github.com/Dolibarr/dolibarr/commit/c7937a9962808b70efa878b4a1d8262ec790ba32
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-27 (Sat, 27 Dec 2014)

  Changed paths:
    M htdocs/product/stats/facture.php

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6


  Commit: 1ab6955494849e57cad898585082f7be18b3f021
      
https://github.com/Dolibarr/dolibarr/commit/1ab6955494849e57cad898585082f7be18b3f021
  Author: Christophe Battarel <address@hidden>
  Date:   2014-12-27 (Sat, 27 Dec 2014)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX: dont remove price ht if it is forced (ie: calculated by margin rate
and cost price, or by external module)


  Commit: 191d4467e358274a77e21f821838924170fd99f3
      
https://github.com/Dolibarr/dolibarr/commit/191d4467e358274a77e21f821838924170fd99f3
  Author: BENKE Charles <address@hidden>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Update facture.php

$soc already filled upper when $socid send


  Commit: 337d0558726a9e20485b5547b32100dc9352446a
      
https://github.com/Dolibarr/dolibarr/commit/337d0558726a9e20485b5547b32100dc9352446a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #2199 from altatof/3.6

FIX: dont remove price ht if it is forced (ie: calculated by margin rate and 
cost price, or by external module)


  Commit: e5f81b1fecf5899cdc151ba322ba56d50df55a2f
      
https://github.com/Dolibarr/dolibarr/commit/e5f81b1fecf5899cdc151ba322ba56d50df55a2f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #2202 from defrance69/patch-38

Update facture.php


  Commit: a668d163fdbf3cf97ba685b015a2c6ff4b573ef9
      
https://github.com/Dolibarr/dolibarr/commit/a668d163fdbf3cf97ba685b015a2c6ff4b573ef9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Repair corrupted data


  Commit: 4ce7a27dca9c26f59ea9c902d0a5eaf5b8b782d6
      
https://github.com/Dolibarr/dolibarr/commit/4ce7a27dca9c26f59ea9c902d0a5eaf5b8b782d6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6


  Commit: 068ae7f0d4da5f63bc93891c858472141fecdd0e
      
https://github.com/Dolibarr/dolibarr/commit/068ae7f0d4da5f63bc93891c858472141fecdd0e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-09 (Fri, 09 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  - Fix: ref_ext was not saved when recording a customer order from web
service


  Commit: 32edb33411601018ed6bba70daaadd2034c21ea7
      
https://github.com/Dolibarr/dolibarr/commit/32edb33411601018ed6bba70daaadd2034c21ea7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-09 (Fri, 09 Jan 2015)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Start 3.6.3


  Commit: 90add2fa9636695eb4f7420f7153f8d14aae5649
      
https://github.com/Dolibarr/dolibarr/commit/90add2fa9636695eb4f7420f7153f8d14aae5649
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-10 (Sat, 10 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: amarok is a bugged theme making dolidroid failed. We swith to
eldy automatically with dolidroid.


  Commit: c441aa89db3876758277ca3f272f64c8c007219b
      
https://github.com/Dolibarr/dolibarr/commit/c441aa89db3876758277ca3f272f64c8c007219b
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-10 (Sat, 10 Jan 2015)

  Changed paths:
    M htdocs/core/modules/DolibarrModules.class.php

  Log Message:
  -----------
  Fixed: Avoid warning


  Commit: 26cad2400eea91656650f15169815c4663a7f6cd
      
https://github.com/Dolibarr/dolibarr/commit/26cad2400eea91656650f15169815c4663a7f6cd
  Author: Cedric <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  Fix missing lang key


  Commit: d2cd841573110cb5a57746ce077aea5cf7890103
      
https://github.com/Dolibarr/dolibarr/commit/d2cd841573110cb5a57746ce077aea5cf7890103
  Author: Cedric <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M htdocs/cron/card.php

  Log Message:
  -----------
  Fix divide by zero error


  Commit: 7e16d0c1d3de4e30fa0649acaf4a32af715752d3
      
https://github.com/Dolibarr/dolibarr/commit/7e16d0c1d3de4e30fa0649acaf4a32af715752d3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Fix: [ bug #1792 ] Users are not allowed to see margins module index page 
when no product view permission is enabled


  Commit: 6c4702f282e74769377eb56f13b31d8c07d3b0d2
      
https://github.com/Dolibarr/dolibarr/commit/6c4702f282e74769377eb56f13b31d8c07d3b0d2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Fix: [ bug #1785 ] Start date is lost in Project > Linked objects


  Commit: 85b1188593201dcfe6c6ca6ecc6e1ee31478c442
      
https://github.com/Dolibarr/dolibarr/commit/85b1188593201dcfe6c6ca6ecc6e1ee31478c442
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
   Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php


  Commit: 7b4cf976dfa14d08d145e351e204210d831fddeb
      
https://github.com/Dolibarr/dolibarr/commit/7b4cf976dfa14d08d145e351e204210d831fddeb
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
  Corrected translation typos


  Commit: 4da52cf733cdb40cf954195dcd7dacded9964982
      
https://github.com/Dolibarr/dolibarr/commit/4da52cf733cdb40cf954195dcd7dacded9964982
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Fix:  [ bug #1797 ] Tulip Supplier invoice module takes creation date instead 
of invoice date


  Commit: d40eab2494be4bc9d6379be26bcaab78bd9ff896
      
https://github.com/Dolibarr/dolibarr/commit/d40eab2494be4bc9d6379be26bcaab78bd9ff896
  Author: Juanjo Menent <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix: withdrawal create error if in the same month are deleted previus
withdrawals.


  Commit: 71b609fab0b440f23def50ed972fdf58ed2297b9
      
https://github.com/Dolibarr/dolibarr/commit/71b609fab0b440f23def50ed972fdf58ed2297b9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice 
date given to numeration modules


  Commit: 88c3509dd089da4684549e7c9ec2a9208a0883f9
      
https://github.com/Dolibarr/dolibarr/commit/88c3509dd089da4684549e7c9ec2a9208a0883f9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php

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

Conflicts:
        ChangeLog


  Commit: 61809ef6b5211c048e6ec49df18a5e677f335a0c
      
https://github.com/Dolibarr/dolibarr/commit/61809ef6b5211c048e6ec49df18a5e677f335a0c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database


  Commit: 999a6052ff6e703e1935fea31a5ea3db9474e5c6
      
https://github.com/Dolibarr/dolibarr/commit/999a6052ff6e703e1935fea31a5ea3db9474e5c6
  Author: Cedric <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  FIX : Creating default object from empty when validating supplier order


  Commit: 4c8de741406adbfc51ecdc5c30a59a96e6f4b976
      
https://github.com/Dolibarr/dolibarr/commit/4c8de741406adbfc51ecdc5c30a59a96e6f4b976
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #2242 from marcosgdf/3.6

Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice 
date given to numeration modules


  Commit: 6f00cecd81a3dcce2f55c826ae2c7620045dd6e9
      
https://github.com/Dolibarr/dolibarr/commit/6f00cecd81a3dcce2f55c826ae2c7620045dd6e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Merge pull request #2244 from KreizIT/fix_default_empty

FIX : Creating default object from empty when validating supplier order


  Commit: 5087ac815309dbea8efec2508cb6aceadd1f8b29
      
https://github.com/Dolibarr/dolibarr/commit/5087ac815309dbea8efec2508cb6aceadd1f8b29
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Merge pull request #2237 from marcosgdf/bug-1797

Fix:  [ bug #1797 ] Tulip Supplier invoice module takes creation date instead 
of invoice date


  Commit: 767afd3c9f67ac5b42be2ac8cfbdbcf870dbe613
      
https://github.com/Dolibarr/dolibarr/commit/767afd3c9f67ac5b42be2ac8cfbdbcf870dbe613
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M htdocs/cron/card.php
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Merge pull request #2231 from KreizIT/fix_cron

Fix cron


  Commit: d1a0187f82b6f0ea1a941029b4bcf503a66ecd23
      
https://github.com/Dolibarr/dolibarr/commit/d1a0187f82b6f0ea1a941029b4bcf503a66ecd23
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2236 from marcosgdf/translations

Corrected translation typos


  Commit: fe5533d1c37444031539d2d8aaa7aa4c95a2513f
      
https://github.com/Dolibarr/dolibarr/commit/fe5533d1c37444031539d2d8aaa7aa4c95a2513f
  Author: Juanjo Menent <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix: PostgreSQL compatibilty


  Commit: a64084308d2c58d1f4ef89520a611ca050e775a5
      
https://github.com/Dolibarr/dolibarr/commit/a64084308d2c58d1f4ef89520a611ca050e775a5
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: [ bug #1804 ] SQL error when sending email without addresee


  Commit: 068045f6a0a7abb6a68c8b4c1c86aff9420dba24
      
https://github.com/Dolibarr/dolibarr/commit/068045f6a0a7abb6a68c8b4c1c86aff9420dba24
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formcompany.class.php

  Log Message:
  -----------
  Fix: [ bug #1803 ] AJAX company contact input is not aligned


  Commit: ed839114ab3b4fcc7f27f8a31f6c04c948af22b7
      
https://github.com/Dolibarr/dolibarr/commit/ed839114ab3b4fcc7f27f8a31f6c04c948af22b7
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Fixed loading of external numeration modules in FactureFournisseur and Propal


  Commit: 41e01a22a3dfb5aa762ec212d3199f04a21f51b8
      
https://github.com/Dolibarr/dolibarr/commit/41e01a22a3dfb5aa762ec212d3199f04a21f51b8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Fixed loading of external numeration modules in Contrat, Commande, Facture, 
Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code


  Commit: 103a433bdf912cb8bacd819f7a4192e2b778ccb2
      
https://github.com/Dolibarr/dolibarr/commit/103a433bdf912cb8bacd819f7a4192e2b778ccb2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
   Fix: [ bug #1796 ] Unable to use numeration modules from an external module


  Commit: cc9197e4c85df1daae9c66dbdddd20348d9c1f1c
      
https://github.com/Dolibarr/dolibarr/commit/cc9197e4c85df1daae9c66dbdddd20348d9c1f1c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

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

  Log Message:
  -----------
  Fixed problem with Fichinter::getNextNumRef


  Commit: 7f59cf919403d858f00fd3028e6eab875b03d96a
      
https://github.com/Dolibarr/dolibarr/commit/7f59cf919403d858f00fd3028e6eab875b03d96a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/paiement.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/resource/card.php

  Log Message:
  -----------
  Fix: [ bug #1787 ] Incorrect behaviour of doActions hook


  Commit: dacec491ff56cc21c784deb11c54d46359c38131
      
https://github.com/Dolibarr/dolibarr/commit/dacec491ff56cc21c784deb11c54d46359c38131
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/menubase.class.php

  Log Message:
  -----------
   Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL 
and MySQL strict mode ON


  Commit: 003aa5ee4433059b1d68ec7e147996bafd467051
      
https://github.com/Dolibarr/dolibarr/commit/003aa5ee4433059b1d68ec7e147996bafd467051
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
   Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due 
amount


  Commit: 78905c6af1bd95dd957c4426bb341074b88ff77a
      
https://github.com/Dolibarr/dolibarr/commit/78905c6af1bd95dd957c4426bb341074b88ff77a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas


  Commit: 17b14eed88bfb2cf9073b34f2948cbe9ee8b7016
      
https://github.com/Dolibarr/dolibarr/commit/17b14eed88bfb2cf9073b34f2948cbe9ee8b7016
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated bug title


  Commit: 4639ce33646a7d7bc5fcb7c468177cd953986668
      
https://github.com/Dolibarr/dolibarr/commit/4639ce33646a7d7bc5fcb7c468177cd953986668
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1802

Conflicts:
        ChangeLog


  Commit: 1a552cf643c1856a9841887270b6b99e9daab441
      
https://github.com/Dolibarr/dolibarr/commit/1a552cf643c1856a9841887270b6b99e9daab441
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-1802' into 3.6


  Commit: 2f4352c759b803bcd05c25c332ba996de21d0b15
      
https://github.com/Dolibarr/dolibarr/commit/2f4352c759b803bcd05c25c332ba996de21d0b15
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1785

Conflicts:
        ChangeLog


  Commit: 896b92438035fa99f1be9671026ed1d2dd5ae6e1
      
https://github.com/Dolibarr/dolibarr/commit/896b92438035fa99f1be9671026ed1d2dd5ae6e1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-1785' into 3.6


  Commit: b1f889e1d1aad79d8ce8715dc348d9a8029e2444
      
https://github.com/Dolibarr/dolibarr/commit/b1f889e1d1aad79d8ce8715dc348d9a8029e2444
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

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


  Commit: 05f08a7181cbeb5f9c83a9e0e0cf19252f893cd4
      
https://github.com/Dolibarr/dolibarr/commit/05f08a7181cbeb5f9c83a9e0e0cf19252f893cd4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1762

Conflicts:
        ChangeLog


  Commit: a51ea308f55b2cf7b731dea35d9ffbbc4a818014
      
https://github.com/Dolibarr/dolibarr/commit/a51ea308f55b2cf7b731dea35d9ffbbc4a818014
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1762' into 3.5


  Commit: 056c0b0ca15a9364a1a84dae4de3cc5e93e2798d
      
https://github.com/Dolibarr/dolibarr/commit/056c0b0ca15a9364a1a84dae4de3cc5e93e2798d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1788' into 3.6


  Commit: 0513ce25e50c7f496934cec0381cc4232fa2917e
      
https://github.com/Dolibarr/dolibarr/commit/0513ce25e50c7f496934cec0381cc4232fa2917e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/cron/card.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6

Conflicts:
        ChangeLog


  Commit: cef48d1275576192606c065a685b7daa9cecd25a
      
https://github.com/Dolibarr/dolibarr/commit/cef48d1275576192606c065a685b7daa9cecd25a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1804

Conflicts:
        ChangeLog


  Commit: c1f3d66686a853014c55aab1610d69c8ee85b886
      
https://github.com/Dolibarr/dolibarr/commit/c1f3d66686a853014c55aab1610d69c8ee85b886
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1804' into 3.6


  Commit: c35de1aa06a9f54a768b67d0b6d88e2acf34f6eb
      
https://github.com/Dolibarr/dolibarr/commit/c35de1aa06a9f54a768b67d0b6d88e2acf34f6eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formcompany.class.php

  Log Message:
  -----------
  Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1803

Conflicts:
        ChangeLog


  Commit: ccaab5e183ffb976b235eadcc74c6c52c015053c
      
https://github.com/Dolibarr/dolibarr/commit/ccaab5e183ffb976b235eadcc74c6c52c015053c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formcompany.class.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1803' into 3.6


  Commit: b3e216b8f1d26f4d466ea68500c95f8b75304051
      
https://github.com/Dolibarr/dolibarr/commit/b3e216b8f1d26f4d466ea68500c95f8b75304051
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/paiement.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/resource/card.php

  Log Message:
  -----------
  Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1787

Conflicts:
        ChangeLog
        htdocs/comm/propal.php


  Commit: abf961707d80e72068ee07d7f003386526d1db7c
      
https://github.com/Dolibarr/dolibarr/commit/abf961707d80e72068ee07d7f003386526d1db7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/paiement.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/resource/card.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1787' into 3.6


  Commit: 7c5927ef931048dc699652697ace413a3d539262
      
https://github.com/Dolibarr/dolibarr/commit/7c5927ef931048dc699652697ace413a3d539262
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  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/contrat/class/contrat.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1796

Conflicts:
        ChangeLog


  Commit: a0de75c727c0f6d66e3fb6f4f148fb0032e60289
      
https://github.com/Dolibarr/dolibarr/commit/a0de75c727c0f6d66e3fb6f4f148fb0032e60289
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  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/contrat/class/contrat.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1796' into 3.6


  Commit: d1e2ab6f564f9d31f6723c540d317b829346a65a
      
https://github.com/Dolibarr/dolibarr/commit/d1e2ab6f564f9d31f6723c540d317b829346a65a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/menubase.class.php

  Log Message:
  -----------
  Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1783

Conflicts:
        ChangeLog


  Commit: 5ec7b10dc71fcbd7bd75d30aa45874471fcb6f99
      
https://github.com/Dolibarr/dolibarr/commit/5ec7b10dc71fcbd7bd75d30aa45874471fcb6f99
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/menubase.class.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1783' into 3.6


  Commit: ff65035aee6c78af9c5eddbf281c6976fff41bb9
      
https://github.com/Dolibarr/dolibarr/commit/ff65035aee6c78af9c5eddbf281c6976fff41bb9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1717

Conflicts:
        ChangeLog


  Commit: a696ad62c34f228dcbcd54891939288cb6345a34
      
https://github.com/Dolibarr/dolibarr/commit/a696ad62c34f228dcbcd54891939288cb6345a34
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1717' into 3.6


  Commit: 7b7b8f376f682c2fa92e090dd5b42a98fe752ec8
      
https://github.com/Dolibarr/dolibarr/commit/7b7b8f376f682c2fa92e090dd5b42a98fe752ec8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1784

Conflicts:
        ChangeLog


  Commit: 5ed5a729d5c9904fbbf98e132949a8c98c9b356c
      
https://github.com/Dolibarr/dolibarr/commit/5ed5a729d5c9904fbbf98e132949a8c98c9b356c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1784' into 3.6


  Commit: 08214999a7a8d1f123d546d5bce9c7f992073240
      
https://github.com/Dolibarr/dolibarr/commit/08214999a7a8d1f123d546d5bce9c7f992073240
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php

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


  Commit: 3547e4ad9940bf49f3a4a8810b5d28630a20ea33
      
https://github.com/Dolibarr/dolibarr/commit/3547e4ad9940bf49f3a4a8810b5d28630a20ea33
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M build/debian/changelog
    A build/exe/doliwamp/.gitignore
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/adherents/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/paiement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/cron/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/main.inc.php
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/stats/facture.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/resource/card.php
    M htdocs/societe/class/societe.class.php

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

Conflicts:
        htdocs/comm/propal.php
        htdocs/commande/fiche.php
        htdocs/compta/facture.php
        htdocs/compta/paiement.php
        htdocs/expedition/fiche.php
        htdocs/fourn/facture/paiement.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bce9e08f2588...3547e4ad9940
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 75dbcf: Fixed: doxygen, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 7e16d0: Fix: [ bug #1792 ] Users are not allowed to see ma...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 90add2: Fix: amarok is a bugged theme making dolidroid fai...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 71e5cf: Fix: [ bug #1735 ] Rights to delete expense notes ...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 1dd76e: Avoid request if possible
Index(es):
- Date
- Thread