dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] e1fa86: The approved status is enough


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] e1fa86: The approved status is enough to expense appear in...
Date: Sun, 22 May 2016 05:22:39 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e1fa86914e1c81259a38ae09e14464160057f43b
      
https://github.com/Dolibarr/dolibarr/commit/e1fa86914e1c81259a38ae09e14464160057f43b
  Author: Your Name <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  The approved status is enough to expense appear in the report


  Commit: c30a3a5f7eb7318e9ade664889681f5a51777f90
      
https://github.com/Dolibarr/dolibarr/commit/c30a3a5f7eb7318e9ade664889681f5a51777f90
  Author: Your Name <address@hidden>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php

  Log Message:
  -----------
  Expense report grouped by user


  Commit: 23311cdba1c180065b86868a298075e01de4223f
      
https://github.com/Dolibarr/dolibarr/commit/23311cdba1c180065b86868a298075e01de4223f
  Author: Your Name <address@hidden>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M .gitignore
    M .travis.yml
    A build/composer/README
    M composer.json
    A composer.lock
    M dev/dolibarr_changes.txt
    M dev/skeletons/build_class_from_table.php
    M dev/skeletons/skeleton_list.php
    M htdocs/.gitignore
    M htdocs/adherents/card.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/admin/dict.php
    M htdocs/comm/card.php
    M htdocs/commande/index.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/paiement/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/index.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/index.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/includes/ckeditor/ckeditor/CHANGES.md
    M htdocs/includes/ckeditor/ckeditor/ckeditor.js
    M htdocs/includes/ckeditor/ckeditor/lang/af.js
    M htdocs/includes/ckeditor/ckeditor/lang/ar.js
    M htdocs/includes/ckeditor/ckeditor/lang/bg.js
    M htdocs/includes/ckeditor/ckeditor/lang/bn.js
    M htdocs/includes/ckeditor/ckeditor/lang/bs.js
    M htdocs/includes/ckeditor/ckeditor/lang/ca.js
    M htdocs/includes/ckeditor/ckeditor/lang/cs.js
    M htdocs/includes/ckeditor/ckeditor/lang/cy.js
    M htdocs/includes/ckeditor/ckeditor/lang/da.js
    M htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
    M htdocs/includes/ckeditor/ckeditor/lang/de.js
    M htdocs/includes/ckeditor/ckeditor/lang/el.js
    M htdocs/includes/ckeditor/ckeditor/lang/en-au.js
    M htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
    M htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
    M htdocs/includes/ckeditor/ckeditor/lang/en.js
    M htdocs/includes/ckeditor/ckeditor/lang/eo.js
    M htdocs/includes/ckeditor/ckeditor/lang/es.js
    M htdocs/includes/ckeditor/ckeditor/lang/et.js
    M htdocs/includes/ckeditor/ckeditor/lang/eu.js
    M htdocs/includes/ckeditor/ckeditor/lang/fa.js
    M htdocs/includes/ckeditor/ckeditor/lang/fi.js
    M htdocs/includes/ckeditor/ckeditor/lang/fo.js
    M htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
    M htdocs/includes/ckeditor/ckeditor/lang/fr.js
    M htdocs/includes/ckeditor/ckeditor/lang/gl.js
    M htdocs/includes/ckeditor/ckeditor/lang/gu.js
    M htdocs/includes/ckeditor/ckeditor/lang/he.js
    M htdocs/includes/ckeditor/ckeditor/lang/hi.js
    M htdocs/includes/ckeditor/ckeditor/lang/hr.js
    M htdocs/includes/ckeditor/ckeditor/lang/hu.js
    M htdocs/includes/ckeditor/ckeditor/lang/id.js
    M htdocs/includes/ckeditor/ckeditor/lang/is.js
    M htdocs/includes/ckeditor/ckeditor/lang/it.js
    M htdocs/includes/ckeditor/ckeditor/lang/ja.js
    M htdocs/includes/ckeditor/ckeditor/lang/ka.js
    M htdocs/includes/ckeditor/ckeditor/lang/km.js
    M htdocs/includes/ckeditor/ckeditor/lang/ko.js
    M htdocs/includes/ckeditor/ckeditor/lang/ku.js
    M htdocs/includes/ckeditor/ckeditor/lang/lt.js
    M htdocs/includes/ckeditor/ckeditor/lang/lv.js
    M htdocs/includes/ckeditor/ckeditor/lang/mk.js
    M htdocs/includes/ckeditor/ckeditor/lang/mn.js
    M htdocs/includes/ckeditor/ckeditor/lang/ms.js
    M htdocs/includes/ckeditor/ckeditor/lang/nb.js
    M htdocs/includes/ckeditor/ckeditor/lang/nl.js
    M htdocs/includes/ckeditor/ckeditor/lang/no.js
    M htdocs/includes/ckeditor/ckeditor/lang/pl.js
    M htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
    M htdocs/includes/ckeditor/ckeditor/lang/pt.js
    M htdocs/includes/ckeditor/ckeditor/lang/ro.js
    M htdocs/includes/ckeditor/ckeditor/lang/ru.js
    M htdocs/includes/ckeditor/ckeditor/lang/si.js
    M htdocs/includes/ckeditor/ckeditor/lang/sk.js
    M htdocs/includes/ckeditor/ckeditor/lang/sl.js
    M htdocs/includes/ckeditor/ckeditor/lang/sq.js
    M htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
    M htdocs/includes/ckeditor/ckeditor/lang/sr.js
    M htdocs/includes/ckeditor/ckeditor/lang/sv.js
    M htdocs/includes/ckeditor/ckeditor/lang/th.js
    M htdocs/includes/ckeditor/ckeditor/lang/tr.js
    M htdocs/includes/ckeditor/ckeditor/lang/tt.js
    M htdocs/includes/ckeditor/ckeditor/lang/ug.js
    M htdocs/includes/ckeditor/ckeditor/lang/uk.js
    M htdocs/includes/ckeditor/ckeditor/lang/vi.js
    M htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
    M htdocs/includes/ckeditor/ckeditor/lang/zh.js
    M htdocs/includes/ckeditor/ckeditor/package.json
    A 
htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
    M 
htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
    M htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
    M htdocs/includes/ckeditor/ckeditor/plugins/icons.png
    M htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
    M htdocs/includes/ckeditor/ckeditor/samples/old/index.html
    M htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
    M htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
    M htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
    M htdocs/includes/mike42/escpos-php/.gitignore
    R htdocs/includes/mike42/escpos-php/.travis.yml
    A htdocs/includes/mike42/escpos-php/Escpos.php
    M htdocs/includes/mike42/escpos-php/README.md
    R htdocs/includes/mike42/escpos-php/autoload.php
    M htdocs/includes/mike42/escpos-php/composer.json
    A htdocs/includes/mike42/escpos-php/example/README.md
    A htdocs/includes/mike42/escpos-php/example/barcode.php
    A htdocs/includes/mike42/escpos-php/example/bit-image.php
    A 
htdocs/includes/mike42/escpos-php/example/character-encodings-with-images.php
    A htdocs/includes/mike42/escpos-php/example/character-encodings.php
    A htdocs/includes/mike42/escpos-php/example/character-tables.php
    A htdocs/includes/mike42/escpos-php/example/demo.php
    A htdocs/includes/mike42/escpos-php/example/graphics.php
    A htdocs/includes/mike42/escpos-php/example/interface/README.md
    A htdocs/includes/mike42/escpos-php/example/interface/ethernet.php
    A htdocs/includes/mike42/escpos-php/example/interface/linux-usb.php
    A htdocs/includes/mike42/escpos-php/example/interface/smb.php
    A htdocs/includes/mike42/escpos-php/example/interface/windows-lpt.php
    A htdocs/includes/mike42/escpos-php/example/interface/windows-usb.php
    A htdocs/includes/mike42/escpos-php/example/print-from-html.php
    A htdocs/includes/mike42/escpos-php/example/print-from-pdf.php
    A htdocs/includes/mike42/escpos-php/example/qr-code.php
    A htdocs/includes/mike42/escpos-php/example/receipt-with-logo.php
    A 
htdocs/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
    A htdocs/includes/mike42/escpos-php/example/resources/document.odt
    A htdocs/includes/mike42/escpos-php/example/resources/document.pdf
    A htdocs/includes/mike42/escpos-php/example/resources/document.z
    A htdocs/includes/mike42/escpos-php/example/resources/escpos-php-small.png
    A htdocs/includes/mike42/escpos-php/example/resources/escpos-php.png
    A htdocs/includes/mike42/escpos-php/example/resources/tux.png
    A 
htdocs/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
    A 
htdocs/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
    A 
htdocs/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
    A htdocs/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
    A 
htdocs/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
    A htdocs/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
    A htdocs/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
    A 
htdocs/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
    A htdocs/includes/mike42/escpos-php/example/specific/README.md
    A htdocs/includes/mike42/escpos-php/example/text-size.php
    A htdocs/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/CodePage.php
    A htdocs/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/DummyPrintConnector.php
    A htdocs/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/EscposImage.php
    A htdocs/includes/mike42/escpos-php/src/EscposPrintBuffer.php
    A htdocs/includes/mike42/escpos-php/src/FilePrintConnector.php
    A htdocs/includes/mike42/escpos-php/src/ImagePrintBuffer.php
    A htdocs/includes/mike42/escpos-php/src/NetworkPrintConnector.php
    A htdocs/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/PrintBuffer.php
    A htdocs/includes/mike42/escpos-php/src/PrintConnector.php
    A htdocs/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/StarCapabilityProfile.php
    A htdocs/includes/mike42/escpos-php/src/WindowsPrintConnector.php
    A 
htdocs/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
    A 
htdocs/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
    A 
htdocs/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
    A htdocs/includes/mike42/escpos-php/test/bootstrap.php
    A htdocs/includes/mike42/escpos-php/test/integration/ExampleTest.php
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
    A 
htdocs/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
    A htdocs/includes/mike42/escpos-php/test/phpunit.xml
    A 
htdocs/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
    A htdocs/includes/mike42/escpos-php/test/unit/EscposImageTest.php
    A htdocs/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
    A htdocs/includes/mike42/escpos-php/test/unit/EscposTest.php
    A htdocs/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
    A 
htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
    A 
htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
    A htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
    A htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.gif
    A htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
    A htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.png
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
    A htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
    A htdocs/includes/mike42/escpos-php/test/unit/resources/demo.php
    A htdocs/includes/mike42/escpos-php/test/unit/resources/doc.pdf
    M htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
    M htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_c_accounting_category.sql
    M htdocs/install/mysql/tables/llx_product_batch.key.sql
    M htdocs/install/mysql/tables/llx_product_lot.sql
    R htdocs/install/mysql/tables/llx_stock_lotserial.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/class/productbatch.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/info.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stats/card.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/mouvementstock.class.php
    A htdocs/product/stock/class/productlot.class.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    A htdocs/product/stock/productlot_card.php
    A htdocs/product/stock/productlot_list.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/product/traduction.php
    M htdocs/projet/class/project.class.php
    M htdocs/resource/class/html.formresource.class.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/note.php
    M htdocs/societe/project.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M test/phpunit/CommandeFournisseurTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/RestAPIUserTest.php
    M test/phpunit/SqlTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/develop' into expenses


  Commit: c2b958a039fbd828679d2421ea6bb167c5e02319
      
https://github.com/Dolibarr/dolibarr/commit/c2b958a039fbd828679d2421ea6bb167c5e02319
  Author: Your Name <address@hidden>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php

  Log Message:
  -----------
  Correction compatibility Postgresql


  Commit: 106f456c6b22838385fb050255de8878a44700da
      
https://github.com/Dolibarr/dolibarr/commit/106f456c6b22838385fb050255de8878a44700da
  Author: Your Name <address@hidden>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php

  Log Message:
  -----------
  Last change


  Commit: 3abe1d8e81b2ea4bdda161137bc9b8b21cfde7cc
      
https://github.com/Dolibarr/dolibarr/commit/3abe1d8e81b2ea4bdda161137bc9b8b21cfde7cc
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-22 (Sun, 22 May 2016)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Merge pull request #5220 from fmarcet/expenses

The approved status is enough to expense appear in the report


Compare: 
https://github.com/Dolibarr/dolibarr/compare/87d26ecef661...3abe1d8e81b2

reply via email to

[Prev in Thread] Current Thread [Next in Thread]