lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,233 Commits 43 Branches 150 Tags 886 MiB
bb2c829997
Commit Graph

1042 Commits

Author SHA1 Message Date
Marcos García de La Fuente
8d96675607 Force logged user to create surveys and applied Dolibarr style to poll creation wizard 2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa Improving the use of permissions in opensurvey module 2014-01-05 06:18:26 +01:00
Laurent Destailleur
5a7fe6b4a7 Fix: Change to make debian package ok despite removal of ckeditor 
package.
 2014-01-05 01:17:38 +01:00
Laurent Destailleur
ee1e7471ff Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405 Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
 2014-01-04 16:13:34 +01:00
Laurent Destailleur
f6cda9deb6 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
694fd5810a Removed unuseful opensurvey admin page 2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/debian/changelog
 2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096 Fix: doxygen 2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4 Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.
 2014-01-02 20:45:59 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191 Fix: Can import contacts not linked to any thirdparties. 2013-12-24 16:11:23 +01:00
Laurent Destailleur
11e0fb8f7a Fix: Missing ref field into export. 2013-12-17 09:11:36 +01:00
Laurent Destailleur
c34e50114a Start to work on a basic print sticker tool 2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a Start to remove too low level permission. Philisophy of dolibarr is 
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
 2013-12-14 20:58:03 +01:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Laurent Destailleur
8d872ab4fb Uniformize code and more comments 2013-12-14 00:24:43 +01:00
Laurent Destailleur
f804833b9c Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Laurent Destailleur
4d9712ea4c Merge pull request #1318 from csalvador/develop-fichinterPDF 
Develop fichinter pdf
 2013-12-04 09:41:13 -08:00
Laurent Destailleur
b6386a3dce Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2013-12-01 16:08:03 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php 
export extensions
 2013-11-21 17:32:11 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
aspangaro
86a2da31b4 Fix for document cerfa into module Don 2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
a9a2bd9eec Fix error reported by travis. 2013-11-05 14:39:25 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Laurent Destailleur
c51ff1d462 New: Add hidden option to disable log handlers. 2013-10-30 19:08:41 +01:00
Laurent Destailleur
93c5720579 New: Add path to installed dir of external modules + Name and web of 
module provider.
 2013-10-28 01:37:04 +01:00
Laurent Destailleur
966f135316 Fix: Migration must load new boxes 2013-10-26 16:18:28 +02:00
Laurent Destailleur
16bcd6b5e5 Add error management to avoid blank page when there is no permission to 
read file.
 2013-10-23 19:19:54 +02:00
Laurent Destailleur
ca560b4f98 Fix: [ bug #1076 ] Shipment/Delivery PDFs 2013-10-23 18:02:16 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Laurent Destailleur
d111ee97c2 Doc 2013-09-25 12:37:19 +02:00
Laurent Destailleur
26bce0a385 Merge pull request #1207 from defrance69/patch-12 
Update modProjet.class.php
 2013-09-23 00:39:03 -07:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
simnandez
59783cf556 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:52:57 +02:00
simnandez
4c7907b773 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:47:31 +02:00
BENKE Charles
5e9cb8a1d4 Update modProjet.class.php 
add export_dependencies_array
 2013-09-14 10:45:41 +02:00
Laurent Destailleur
d22985c5fa More accurate log file 2013-09-09 12:23:15 +02:00
Laurent Destailleur
3a8784a6de Qual: Mutualize code 2013-09-07 19:08:08 +02:00
Laurent Destailleur
d493dc8513 Merge pull request #1215 from GPCsolutions/develop-review 
Develop review
 2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
0e8eddb470 Revert "Method should be static" 
This reverts commit 4ca5bc3797.
 2013-09-05 19:00:00 +02:00
Juanjo Menent
15bb60c8a1 Merge pull request #1212 from FHenry/develop 
Add ref supplier into muscadet model
 2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
4ca5bc3797 Method should be static 2013-09-05 16:44:02 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Florian Henry
d8ddb8b3e7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f Add ref supplier into muscadet model 2013-09-03 20:07:08 +02:00
BENKE Charles
bb8f8332f9 Update modProjet.class.php 
enhance export feature with
left join and projet_task_time data
 2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop 
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
 2013-09-01 15:01:33 -07:00
Laurent Destailleur
a8096c7359 New: Export/import profile include state. 2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select 
thirdparty list
 2013-08-30 18:18:58 +02:00
Florian Henry
29396bd51a Change SQL syntax 2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb adjust spacing 2013-08-28 16:50:38 +02:00
Florian Henry
650689d294 Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103 2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
simnandez
34fe1fba7f Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378 some fix for contract model 2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00
Laurent Destailleur
07cba2d232 Merge pull request #1194 from grandoc/develop 
fix : warning during install
 2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Grand Philippe
a0c04a548b first step to complete contract functionalities 2013-08-24 15:59:49 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contrat/liste.php
 2013-07-31 12:45:39 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
daa10bcedd Fix: EOF 2013-07-27 12:32:04 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2013-07-26 14:59:18 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b CRLF issue 2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c New: Can show images of product onto proposals. 2013-07-26 12:24:30 +02:00
Laurent Destailleur
339118d6f4 Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932 Merge pull request #1128 from defrance69/patch-9 
Update pdf_blochet.class.php
 2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282 Fix bug export contact extrafields 2013-07-24 15:19:05 +02:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php 
add ref_ext on pdf output if not empty
 2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix 
fix pdf model import
 2013-07-24 01:30:55 -07:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php 
Add bordereau ref_ext fields on export
 2013-07-23 05:54:47 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5 
Update modBanque.class.php
 2013-07-22 00:05:46 -07:00