[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dfcb38: [ task #793 ] Add extrafield
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dfcb38: [ task #793 ] Add extrafield feature into Orders m... |
|
Date: |
Mon, 08 Apr 2013 02:08:37 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: dfcb38d13f2264358e0822f2d0fef279b9c42ed9
https://github.com/Dolibarr/dolibarr/commit/dfcb38d13f2264358e0822f2d0fef279b9c42ed9
Author: fhenry <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
A htdocs/admin/order_extrafields.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/core/lib/order.lib.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.sql
Log Message:
-----------
[ task #793 ] Add extrafield feature into Orders module
Commit: b7137606ee4f08de0154ebe5a29415533b3abfad
https://github.com/Dolibarr/dolibarr/commit/b7137606ee4f08de0154ebe5a29415533b3abfad
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/admin/carrier.php
M htdocs/comm/action/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/prospect/list.php
M htdocs/commande/fiche.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/paiement/liste.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_members.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/core/modules/modPrintIPP.class.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_add.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_facture_fourn.sql
M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
A htdocs/install/mysql/tables/llx_printer_ipp.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_socpeople.sql
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
M htdocs/product/class/product.class.php
M htdocs/product/fournisseurs.php
M htdocs/societe/consumption.php
M htdocs/support/index.php
M htdocs/user/class/user.class.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge branch 'develop' into develop_orderextrafield
Conflicts:
htdocs/commande/fiche.php
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
Commit: cc465380dafdc0f7ae2635a0771840bd6e1a94a7
https://github.com/Dolibarr/dolibarr/commit/cc465380dafdc0f7ae2635a0771840bd6e1a94a7
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_printer_ipp.sql
Log Message:
-----------
Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)
Commit: 7d2ba5f1b3e986e7c78d9b72c9f04a5f78644981
https://github.com/Dolibarr/dolibarr/commit/7d2ba5f1b3e986e7c78d9b72c9f04a5f78644981
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Fix bug : create supplier invoice ($infos_bits instead of $info_bits)
in updateline sql query
Commit: e5bdcdcadb5196dbe81906ae3772c8a4da84a8bc
https://github.com/Dolibarr/dolibarr/commit/e5bdcdcadb5196dbe81906ae3772c8a4da84a8bc
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Same bug fixing
Commit: 48b510dd4576902b2d0e20dc8e8988321e49d02e
https://github.com/Dolibarr/dolibarr/commit/48b510dd4576902b2d0e20dc8e8988321e49d02e
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Same bug fixing
Commit: 0aba3cfc05c9d33466dd9d7f9bc93dd9a338bb37
https://github.com/Dolibarr/dolibarr/commit/0aba3cfc05c9d33466dd9d7f9bc93dd9a338bb37
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/admin/supplier_invoice.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
Log Message:
-----------
Fix order_supplier and invoice_supplier PDF model name
Commit: 9ff559b033fad1eefe97f13714f69e6ca4118fff
https://github.com/Dolibarr/dolibarr/commit/9ff559b033fad1eefe97f13714f69e6ca4118fff
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Add wished delivery date into supplier orders PDF muscadet
Commit: 2b0668bf81c997a02413a7b299bcfdf5ed9d6309
https://github.com/Dolibarr/dolibarr/commit/2b0668bf81c997a02413a7b299bcfdf5ed9d6309
Author: fhenry <address@hidden>
Date: 2013-04-06 (Sat, 06 Apr 2013)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Add paiement mode et delay on PDF muscadet
Commit: 144ab2454572d7c1e7de8da29072cbaa6a9add35
https://github.com/Dolibarr/dolibarr/commit/144ab2454572d7c1e7de8da29072cbaa6a9add35
Author: fhenry <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/public.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/upgrade.php
M htdocs/langs/en_US/members.lang
A htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/companies.lang
A htdocs/langs/es_PE/compta.lang
A htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/propal.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
Commit: 0427080a4e80d2d09cff247b174cd453c3bb91f6
https://github.com/Dolibarr/dolibarr/commit/0427080a4e80d2d09cff247b174cd453c3bb91f6
Author: fhenry <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/public.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/upgrade.php
M htdocs/langs/en_US/members.lang
A htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/companies.lang
A htdocs/langs/es_PE/compta.lang
A htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/propal.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_orderextrafield
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
Commit: 78571e4458abe7fe2a954f289af444b6b543ac7d
https://github.com/Dolibarr/dolibarr/commit/78571e4458abe7fe2a954f289af444b6b543ac7d
Author: fhenry <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M htdocs/admin/supplier_invoice.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_printer_ipp.sql
Log Message:
-----------
Merge branch 'develop' into develop_orderextrafield
Commit: 393007625a1d76d269365a3e3f4b967edbe6a9af
https://github.com/Dolibarr/dolibarr/commit/393007625a1d76d269365a3e3f4b967edbe6a9af
Author: fhenry <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/index.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
A htdocs/includes/odtphp/odt2pdf.sh
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/societe/class/societe.class.php
M htdocs/webservices/server_supplier_invoice.php
M test/phpunit/ContactTest.php
M test/phpunit/FunctionsTest.php
M test/phpunit/SocieteTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
Commit: 52706117d9480a823e3fb39ee5e0ad61d5764953
https://github.com/Dolibarr/dolibarr/commit/52706117d9480a823e3fb39ee5e0ad61d5764953
Author: fhenry <address@hidden>
Date: 2013-04-07 (Sun, 07 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/index.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
A htdocs/includes/odtphp/odt2pdf.sh
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/societe/class/societe.class.php
M htdocs/webservices/server_supplier_invoice.php
M test/phpunit/ContactTest.php
M test/phpunit/FunctionsTest.php
M test/phpunit/SocieteTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Merge branch 'develop' into develop_orderextrafield
Commit: a27b3a211914c5cd159cd6635233232450bca339
https://github.com/Dolibarr/dolibarr/commit/a27b3a211914c5cd159cd6635233232450bca339
Author: fhenry <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_facture_fourn.key.sql
M htdocs/install/mysql/tables/llx_printer_ipp.sql
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Fix PostGreSQL blocking install : wrong SQL syntax
Commit: 8efeb93812fb3a6d17a35d82acabfdc12037c2d9
https://github.com/Dolibarr/dolibarr/commit/8efeb93812fb3a6d17a35d82acabfdc12037c2d9
Author: fhenry <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_facture_fourn.key.sql
M htdocs/install/mysql/tables/llx_printer_ipp.sql
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Merge branch 'develop' into develop_orderextrafield
Commit: 6ff049bcd939e187b4c95dfddaba1da44ca1627b
https://github.com/Dolibarr/dolibarr/commit/6ff049bcd939e187b4c95dfddaba1da44ca1627b
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-08 (Mon, 08 Apr 2013)
Changed paths:
M htdocs/admin/commande.php
A htdocs/admin/order_extrafields.php
M htdocs/admin/supplier_invoice.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/core/lib/order.lib.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
A htdocs/install/mysql/tables/llx_commande_extrafields.sql
M htdocs/install/mysql/tables/llx_facture_fourn.key.sql
M htdocs/install/mysql/tables/llx_printer_ipp.sql
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Merge pull request #806 from FHenry/develop_orderextrafield
[ task #793 ] Add extrafield feature into Orders module
Compare:
https://github.com/Dolibarr/dolibarr/compare/3247ce2d1bf8...6ff049bcd939
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] dfcb38: [ task #793 ] Add extrafield feature into Orders m...,
Laurent Destailleur <=