[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f335c4: New : add extrafield support
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f335c4: New : add extrafield support on propal object |
|
Date: |
Mon, 11 Mar 2013 08:45:10 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: f335c4f306d347a9afc78ab2fae67fba8997e939
https://github.com/Dolibarr/dolibarr/commit/f335c4f306d347a9afc78ab2fae67fba8997e939
Author: jfefe <address@hidden>
Date: 2013-03-04 (Mon, 04 Mar 2013)
Changed paths:
M htdocs/admin/propal.php
A htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/lib/propal.lib.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.sql
Log Message:
-----------
New : add extrafield support on propal object
Commit: 59627408c0ec7570ef687d25cde44880d4c337ba
https://github.com/Dolibarr/dolibarr/commit/59627408c0ec7570ef687d25cde44880d4c337ba
Author: jfefe <address@hidden>
Date: 2013-03-04 (Mon, 04 Mar 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Edit extrafields on propal
Commit: ff2a851ae801e6f46396e77e0ea09c4c9051d22d
https://github.com/Dolibarr/dolibarr/commit/ff2a851ae801e6f46396e77e0ea09c4c9051d22d
Author: JF FERRY <address@hidden(none)>
Date: 2013-03-04 (Mon, 04 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
Log Message:
-----------
Move substitution function for propal to common class & add extrafields
display
Commit: 5ce11d00ddd08a5c18d537fd1fd5928a1d406b47
https://github.com/Dolibarr/dolibarr/commit/5ce11d00ddd08a5c18d537fd1fd5928a1d406b47
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
Log Message:
-----------
Display linked propal information into invoice ODT
Commit: 9e612696f23182e7eef43914e213793b8aaa7551
https://github.com/Dolibarr/dolibarr/commit/9e612696f23182e7eef43914e213793b8aaa7551
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/install/doctemplates/proposals/template_proposal.odt
Log Message:
-----------
Add help about extrafields in ODT propal
Commit: 3cefb62621208a3e87369915a9ee83ae10bf7d17
https://github.com/Dolibarr/dolibarr/commit/3cefb62621208a3e87369915a9ee83ae10bf7d17
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix : incorrect function used to retrieve extrafields for propal
Commit: bd229a941702b7321ef12ea8fef81f2c735de280
https://github.com/Dolibarr/dolibarr/commit/bd229a941702b7321ef12ea8fef81f2c735de280
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Add param to define key name in return array of substitution function
for propal
Commit: 55bfdd341d5cb0e804aed418c2944f70c0a8d732
https://github.com/Dolibarr/dolibarr/commit/55bfdd341d5cb0e804aed418c2944f70c0a8d732
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Fix : change to variable with unused name
Commit: 98774665946d632da50c93dde630edd38baf0ccf
https://github.com/Dolibarr/dolibarr/commit/98774665946d632da50c93dde630edd38baf0ccf
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/install/doctemplates/invoices/template_invoice.odt
Log Message:
-----------
Add information about linked proposal into basic ODT template for invoice
Commit: 9eee5f9509810ed6cefcc17d6c478e0e58b73d6a
https://github.com/Dolibarr/dolibarr/commit/9eee5f9509810ed6cefcc17d6c478e0e58b73d6a
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix : extrafields for propale were note saved after creation
Commit: 61127e82f66a70e2f430acb40dd651fd4b1e0cdb
https://github.com/Dolibarr/dolibarr/commit/61127e82f66a70e2f430acb40dd651fd4b1e0cdb
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
User must have write permission to edit extrafields on propale
Commit: 8b749eaafce7e54181c7c0b7f44d723ca915d636
https://github.com/Dolibarr/dolibarr/commit/8b749eaafce7e54181c7c0b7f44d723ca915d636
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix : extrafields are not saved on update (propale)
Commit: 7d3c35fb9070a178ec39f71b9d04e0705c94947f
https://github.com/Dolibarr/dolibarr/commit/7d3c35fb9070a178ec39f71b9d04e0705c94947f
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/admin/propal.php
A htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/install/doctemplates/invoices/template_invoice.odt
M htdocs/install/doctemplates/proposals/template_proposal.odt
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.sql
Log Message:
-----------
Merge branch 'extra_propal' into extrafields
Commit: 49f1ef173aa4857ba2a4fdf236d4fca6e6d4000a
https://github.com/Dolibarr/dolibarr/commit/49f1ef173aa4857ba2a4fdf236d4fca6e6d4000a
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.sql
Log Message:
-----------
Add table for invoice extrafields
Commit: 88a042ec4168099eb35279b904be2d439066a8f8
https://github.com/Dolibarr/dolibarr/commit/88a042ec4168099eb35279b904be2d439066a8f8
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/admin/facture.php
M htdocs/core/lib/invoice.lib.php
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Prepare invoice admin page to add extrafield support
Commit: 4314d4c7febe265e81f0df0951d04383c96f186b
https://github.com/Dolibarr/dolibarr/commit/4314d4c7febe265e81f0df0951d04383c96f186b
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
A htdocs/compta/facture/admin/facture_cust_extrafields.php
Log Message:
-----------
Add admin screen for extrafields on customer invoices
Commit: 7260e139dfac0c5f42b868e0605587dec11ed360
https://github.com/Dolibarr/dolibarr/commit/7260e139dfac0c5f42b868e0605587dec11ed360
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Add extrafields support when create a customer invoice
Commit: 3ccb0fb92cfc95434f693e1787cf8486836a159d
https://github.com/Dolibarr/dolibarr/commit/3ccb0fb92cfc95434f693e1787cf8486836a159d
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Edit extrafields on customer invoice
Commit: dc1314f4f432fd8daf7ca185a12438c9979d34d1
https://github.com/Dolibarr/dolibarr/commit/dc1314f4f432fd8daf7ca185a12438c9979d34d1
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Retreive extrafield when fetch invoice
Commit: 04617d0eb31852cf3f04408d46ad84fce19d4c15
https://github.com/Dolibarr/dolibarr/commit/04617d0eb31852cf3f04408d46ad84fce19d4c15
Author: jfefe <address@hidden>
Date: 2013-03-05 (Tue, 05 Mar 2013)
Changed paths:
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
Log Message:
-----------
Show extrafields for object into invoice ODT document
Commit: 1690c77aa2049b5d87eb7970377f48bf2bc1a4ef
https://github.com/Dolibarr/dolibarr/commit/1690c77aa2049b5d87eb7970377f48bf2bc1a4ef
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/admin/facture.php
M htdocs/compta/facture.php
A htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.sql
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Merge branch 'extra_invoice' into extrafields
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Commit: 06807ce19867d972b510c1ee250204dce4d297bc
https://github.com/Dolibarr/dolibarr/commit/06807ce19867d972b510c1ee250204dce4d297bc
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix : select correct value of extrafield (select list)
Commit: ac3116930c58d9593ee76f1a4ad1a30c3501b333
https://github.com/Dolibarr/dolibarr/commit/ac3116930c58d9593ee76f1a4ad1a30c3501b333
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Add value to store price type extrafield without currency in ODT
Commit: 65ed01a251530f44a0794c50de654d5eb2e110ec
https://github.com/Dolibarr/dolibarr/commit/65ed01a251530f44a0794c50de654d5eb2e110ec
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Extrafields on ODT (propal) : fix value of price with currency & display date
with correct format
Commit: 289e2e788878e7033b31554de11bb398f8926056
https://github.com/Dolibarr/dolibarr/commit/289e2e788878e7033b31554de11bb398f8926056
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
Log Message:
-----------
New function to fill ODT substitution array with extrafield of object
Commit: fcd81e47eb35a52f3d87200af97e40680b08b864
https://github.com/Dolibarr/dolibarr/commit/fcd81e47eb35a52f3d87200af97e40680b08b864
Author: jfefe <address@hidden>
Date: 2013-03-06 (Wed, 06 Mar 2013)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
Log Message:
-----------
Use price2num() function instead of price() to use calcul in ODT.
Libre/Open Office wants number with dot and no space to allow make calcul in
ODT document
Commit: ba8525bd6a363cb0051df69411b92b230cd31788
https://github.com/Dolibarr/dolibarr/commit/ba8525bd6a363cb0051df69411b92b230cd31788
Author: jfefe <address@hidden>
Date: 2013-03-10 (Sun, 10 Mar 2013)
Changed paths:
M ChangeLog
M dev/initdata/generate-societe.php
M dev/removeutf8bom.sh
M dev/skeletons/modMyModule.class.php
M dev/skeletons/skeleton_class.class.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/accounting.php
M htdocs/admin/dict.php
M htdocs/admin/prelevement.php
M htdocs/asterisk/cidlookup.php
M htdocs/boutique/commande/class/boutiquecommande.class.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/bookmark.php
M htdocs/comm/propal.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/fiche.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/pre.inc.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/deplacement/index.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/stats/index.php
M htdocs/compta/index.php
M htdocs/compta/paiement/cheque/pre.inc.php
M htdocs/compta/stats/cabyuser.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/contact/list.php
M htdocs/contact/vcard.php
M htdocs/contrat/fiche.php
M htdocs/contrat/index.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/class/commonobject.class.php
A htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/price.lib.php
R htdocs/core/menus/smartphone/index.php
R htdocs/core/menus/smartphone/smartphone.lib.php
R htdocs/core/menus/smartphone/smartphone_menu.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts3.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/modAgenda.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFicheinter.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modGravatar.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modPaybox.class.php
M htdocs/core/modules/modPaypal.class.php
A htdocs/core/modules/modPrintIPP.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/exports/class/export.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/contact.php
M htdocs/ftp/pre.inc.php
M htdocs/holiday/class/holiday.class.php
A htdocs/includes/printipp/BasicIPP.php
A htdocs/includes/printipp/CupsPrintIPP.php
A htdocs/includes/printipp/ExtendedPrintIPP.php
A htdocs/includes/printipp/PrintIPP.php
A htdocs/includes/printipp/http_class.php
M htdocs/install/doctemplates/invoices/template_invoice.odt
M htdocs/install/doctemplates/orders/template_order.odt
M htdocs/install/doctemplates/proposals/template_proposal.odt
M htdocs/install/doctemplates/thirdparties/template_thirdparty.odt
M htdocs/install/mysql/data/llx_00_c_pays.sql
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/data/llx_c_actioncomm.sql
A htdocs/install/mysql/data/llx_c_revenuestamp.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.key.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/mysql/tables/llx_adherent.sql
M htdocs/install/mysql/tables/llx_bank_account.sql
M htdocs/install/mysql/tables/llx_c_action_trigger.key.sql
A htdocs/install/mysql/tables/llx_c_revenuestamp.sql
M htdocs/install/mysql/tables/llx_c_tva.sql
M htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
M htdocs/install/mysql/tables/llx_commandedet.sql
M htdocs/install/mysql/tables/llx_contratdet.sql
M htdocs/install/mysql/tables/llx_don.sql
M htdocs/install/mysql/tables/llx_element_contact.sql
M htdocs/install/mysql/tables/llx_entrepot.sql
M htdocs/install/mysql/tables/llx_facture.sql
M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
M htdocs/install/mysql/tables/llx_holiday.sql
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
M htdocs/install/mysql/tables/llx_propaldet.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_societe_address.sql
M htdocs/install/mysql/tables/llx_societe_rib.sql
M htdocs/install/mysql/tables/llx_socpeople.sql
M htdocs/install/upgrade.php
M htdocs/install/upgrade2.php
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/categories.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/interventions.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/members.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/interventions.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/es_ES/admin.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/interventions.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/members.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/interventions.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/banks.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/boxes.lang
M htdocs/langs/tr_TR/commercial.lang
A htdocs/langs/tr_TR/commissions.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/externalsite.lang
A htdocs/langs/tr_TR/holiday.lang
A htdocs/langs/tr_TR/mailmanspip.lang
M htdocs/langs/tr_TR/mails.lang
M htdocs/langs/tr_TR/main.lang
A htdocs/langs/tr_TR/margins.lang
M htdocs/langs/tr_TR/orders.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/tr_TR/propal.lang
M htdocs/langs/tr_TR/stocks.lang
M htdocs/langs/tr_TR/users.lang
M htdocs/main.inc.php
M htdocs/master.inc.php
A htdocs/printipp/admin/printipp.php
A htdocs/printipp/index.php
A htdocs/printipp/lib/printipp.lib.php
M htdocs/product/stock/fiche-valo.php
M htdocs/public/members/new.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/commerciaux.php
M htdocs/societe/notify/fiche.php
M htdocs/societe/notify/index.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/hierarchy.php
M scripts/company/export-contacts-xls-example.php
M scripts/emailings/cron-mailing-send.php
M scripts/emailings/mailing-send.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
R scripts/invoices/rebuild_merge_pdf.php
A scripts/invoices/rebuild_merge_pdf.php
M scripts/members/sync_members_ldap2dolibarr.php
M test/phpunit/AllTests.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/HolidayTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
R test/phpunit/jenkins_phpunittest.xml
M test/phpunit/phpunittest.xml
Log Message:
-----------
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Commit: b0d7b3381550e3326c338a753b2d3ef6d641c576
https://github.com/Dolibarr/dolibarr/commit/b0d7b3381550e3326c338a753b2d3ef6d641c576
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M htdocs/admin/facture.php
M htdocs/admin/propal.php
A htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture.php
A htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
A htdocs/install/mysql/tables/llx_facture_extrafields.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
A htdocs/install/mysql/tables/llx_propal_extrafields.sql
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Merge pull request #715 from jfefe/extrafields
[ task #746 ] add extrafields support on propal object
Compare:
https://github.com/Dolibarr/dolibarr/compare/9eae7758370a...b0d7b3381550
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] f335c4: New : add extrafield support on propal object,
Laurent Destailleur <=