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

[Dolibarr-git] [Dolibarr/dolibarr] a95a81: add categorie user based on c

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] a95a81: add categorie user based on contact user
Date: Tue, 16 Feb 2016 04:55:56 -0800 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a95a810d68ffe1217d9e2a1782df1a96e242f547
      
https://github.com/Dolibarr/dolibarr/commit/a95a810d68ffe1217d9e2a1782df1a96e242f547
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  add categorie user based on contact user


  Commit: c910fd151fac97352e728339df2300f78319f2d7
      
https://github.com/Dolibarr/dolibarr/commit/c910fd151fac97352e728339df2300f78319f2d7
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

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

  Log Message:
  -----------
  add setcategorie on user class


  Commit: 5e288db0e5036712a91c6083c8ea2dfc1e36df30
      
https://github.com/Dolibarr/dolibarr/commit/5e288db0e5036712a91c6083c8ea2dfc1e36df30
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  add categorie user based on contact user

allow to add categorie to user, the same as contact user (because user and 
contact are persons too)


  Commit: e3444e08a7fad56c992d1b0fea1ddf11402948c9
      
https://github.com/Dolibarr/dolibarr/commit/e3444e08a7fad56c992d1b0fea1ddf11402948c9
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    A htdocs/install/mysql/tables/llx_categorie_user.sql

  Log Message:
  -----------
  Create llx_categorie_user.sql


  Commit: b21b5e7bb8f7219f101ffed4f0122c6176381d5e
      
https://github.com/Dolibarr/dolibarr/commit/b21b5e7bb8f7219f101ffed4f0122c6176381d5e
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    A htdocs/install/mysql/tables/llx_categorie_user.key.sql

  Log Message:
  -----------
  Create llx_categorie_user.key.sql


  Commit: 23cb0d437cd5305ccb243640e22ffd1bfc7bfff8
      
https://github.com/Dolibarr/dolibarr/commit/23cb0d437cd5305ccb243640e22ffd1bfc7bfff8
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  Update 3.9.0-4.0.0.sql


  Commit: 9f4909d8b1b02cb2297041de576cfc916de0ac4c
      
https://github.com/Dolibarr/dolibarr/commit/9f4909d8b1b02cb2297041de576cfc916de0ac4c
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Update categorie.class.php


  Commit: 79b79e2accf0e92e1bb519bae4f76b1fb4a13354
      
https://github.com/Dolibarr/dolibarr/commit/79b79e2accf0e92e1bb519bae4f76b1fb4a13354
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Update card.php


  Commit: 30a6b546b1c70ba31ff66bc17c5cf08b8f68d933
      
https://github.com/Dolibarr/dolibarr/commit/30a6b546b1c70ba31ff66bc17c5cf08b8f68d933
  Author: BENKE Charlie <address@hidden>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    M htdocs/contact/card.php

  Log Message:
  -----------
  containing function prefer use text values instead numeric


  Commit: 8fb0f8d9d1a632056057ec8e9be006dec19385b1
      
https://github.com/Dolibarr/dolibarr/commit/8fb0f8d9d1a632056057ec8e9be006dec19385b1
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/contact/card.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    A htdocs/install/mysql/tables/llx_categorie_user.key.sql
    A htdocs/install/mysql/tables/llx_categorie_user.sql
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'patch-100' of https://github.com/defrance/dolibarr into
defrance-patch-100

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql
        htdocs/user/card.php


  Commit: 9e5f54daaaf76c0cdf09af236ce70bfd703b906a
      
https://github.com/Dolibarr/dolibarr/commit/9e5f54daaaf76c0cdf09af236ce70bfd703b906a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/contact/card.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    A htdocs/install/mysql/tables/llx_categorie_user.key.sql
    A htdocs/install/mysql/tables/llx_categorie_user.sql
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  git push origin developMerge branch 'defrance-patch-100' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fad09357f48e...9e5f54daaaf7
reply via email to
[Prev in Thread] Current Thread [Next in Thread]