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

2834 Commits

Author SHA1 Message Date
Laurent Destailleur
f640bf7c61 Manage the reply-to field into mail libs 2016-02-09 11:56:12 +01:00
Laurent Destailleur
7445a0f71c Clean code for generating sheet of barcode. Can choose output filename. 2016-02-08 16:42:34 +01:00
Laurent Destailleur
404663472a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14 More robust error management on barcode module. 2016-02-08 15:49:38 +01:00
Laurent Destailleur
fcf1e20d5b Merge pull request #4578 from frederic34/sticker 
Dictionnary for label sticker and card format
 2016-02-08 14:49:31 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
PeartreeG
4c0f29d234 Update fichinter.lib.php 2016-02-02 14:05:58 +01:00
Florian HENRY
3c94f5d4d4 Add log into next values 2016-02-02 11:38:32 +01:00
PeartreeG
c1ff21c30a add fichinter link to resources 2016-02-01 16:09:58 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea Prepare code to match cron rule: 0 if ok, !=0 if error 2016-01-31 14:20:02 +01:00
PeartreeG
d1018760df Update resource.lib.php 2016-01-31 12:24:19 +01:00
PeartreeG
4c025d4323 Adding additional tabs 2016-01-31 12:23:05 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 15:35:28 +01:00
mic9p
827fd39658 Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 10:35:57 +01:00
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +01:00
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
Laurent Destailleur
469a44a4cf NEW Include number of linked files into badge counter of "Linked files" 
tab.
 2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb NEW Include number of linked files into badge counter of "Linked files" 
tab.
 2016-01-23 17:19:34 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82 Fix: why a floating float here ? 2016-01-21 22:43:20 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910 Fix size of cells make page too large even for large screen 2016-01-21 14:56:26 +01:00
jfefe
7c4a9d140b Replace reserved keyword "Resource" by "DolResource" 
# Conflicts:
#	htdocs/resource/list.php
 2016-01-21 11:26:21 +01:00
Sergio Sanchis Climent
4d75039688 Edited correctly for check values 2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent
0467dac43d Fix userlocaltax 
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
 2016-01-21 11:20:27 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Laurent Destailleur
0f456c46ab Clean project pages to work like other modules 2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
524614ded9 Start to work on a per type view of agenda 2016-01-14 16:52:46 +01:00
Laurent Destailleur
a6416b8797 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372 
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
 2016-01-13 20:41:32 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
c47e18b7e2 Merge pull request #4197 from atm-ph/new_mail_input_file_multiple 
NEW hidden conf to use input file multiple from mail form
 2016-01-09 17:57:50 +01:00
Juanjo Menent
c7ae943e57 Merge pull request #4311 from FHenry/develop 
NEW : if nb total of lines provided in print barre_liste, display beside title
 2016-01-09 17:52:05 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
Sergio Sanchis Climent
dfdf58051e Edited correctly for check values 2016-01-07 09:37:04 +01:00
Laurent Destailleur
2945d2d171 Fix bad condition to show tabs 2016-01-07 00:05:28 +01:00
bobby
7414e4c07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-05 10:30:15 +01:00
Sergio Sanchis Climent
ffd7f4ea30 Fix userlocaltax 
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
 2016-01-05 09:47:14 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
bobby
46532ccb55 FIX/NEW : Accountancy 2015-12-28 11:08:14 +01:00
bobby
eec22169e3 FIX feature 2015-12-28 10:21:38 +01:00
bobby
10ff19eb46 NEW : if nb total of lines provided in print barre_liste, display in 
title
 2015-12-28 10:20:23 +01:00
Laurent Destailleur
a4d5e022cf Fix pagination on limit failed when limit was forced on url 2015-12-24 12:52:11 +01:00
Laurent Destailleur
ad5f65e988 Fix: use the mini image on tooltip of thirdparties 2015-12-21 17:32:57 +01:00
Laurent Destailleur
536413523a Fix to show ref of linked object on documents. Fix is not complete but 
stable.
 2015-12-21 12:52:10 +01:00
Laurent Destailleur
d7e9c92144 Fix bad link on category 
Fix cancel button on categories
Css enhancement.
 2015-12-19 13:55:27 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
cla
ef487c48a4 NEW 
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
 2015-12-16 16:18:29 +01:00
aspangaro
c1e77daeb1 New: Accountancy add a function to remove all zero at the right of the account. 
Thanks to Florian
 2015-12-15 20:48:06 +01:00
aspangaro
687370071b A function to remove zero at the end of the account 2015-12-14 21:38:30 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
phf
2f5f6c9ead NEW hidden conf to use input file multiple from mail form 2015-12-10 13:48:37 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
4a2bda3491 Look enhancement 2015-12-04 23:25:34 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
Laurent Destailleur
eb795a7a9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 18:39:39 +01:00
Laurent Destailleur
8c03e46a83 Removed a TODO 2015-12-04 18:33:57 +01:00
Laurent Destailleur
6542da404e Merge pull request #4129 from aspangaro/develop-bank 
New HRM Add bank tab in user to pay salary or expense report
 2015-12-04 18:23:47 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745 Add rights to see tab (hrm->employee->read) 2015-12-04 12:48:36 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Laurent Destailleur
4dd1cb3e77 Theme MD looks ready for 3.9 now. 2015-12-04 12:12:12 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
Laurent Destailleur
63879c1ca6 Merge pull request #4122 from mrsof/patch-7 
FIX: Cannot set property '_renderItem of undefined
 2015-12-03 11:52:30 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Sof
292d3ba959 FIX: Cannot set property '_renderItem of undefined 
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
 2015-11-30 20:28:36 +01:00
Laurent Destailleur
7b6d8dd23e Fix for smartphone 2015-11-29 01:13:23 +01:00
Laurent Destailleur
5d5cfd498a Add holiday date functions into PHPUnit 2015-11-28 19:54:16 +01:00
Laurent Destailleur
fcdb3af708 Merge pull request #4106 from aspangaro/develop-skype 
New: Better integration of skype for dolibarr 3.9
 2015-11-28 16:31:35 +01:00
Laurent Destailleur
5b22eee938 FIX #4099 2015-11-28 16:11:15 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
Raphaël Doursenaud
973e42d10f FIX #4097 Public holiday calculation 
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
 2015-11-25 19:34:11 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
Laurent Destailleur
c7447b0899 Add thirdparty of project into project summary of project home page. 
Total use a different color
 2015-11-21 20:25:28 +01:00
Laurent Destailleur
6f7a3f2c66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-21 20:00:50 +01:00
Laurent Destailleur
e3c6e4ebe5 NEW Add planned workload and declared progress on project summary list 
on project home page (data aggregated from tasks of project)
 2015-11-21 20:00:38 +01:00
philippe grand
55bab28b9c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 17:15:56 +01:00
Laurent Destailleur
c15c0f6fbb Minor css fix 2015-11-21 15:31:27 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
philippe grand
928c44b04f Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 04:52:19 +01:00
Laurent Destailleur
60724df496 Merge pull request #4038 from atm-maxime/develop 
NEW add info page on product card
 2015-11-21 01:51:32 +01:00
Laurent Destailleur
552ecbcd95 Merge pull request #3964 from aspangaro/develop-hrm3 
HRM : Work in progress
 2015-11-21 00:14:41 +01:00
Drosis Nikos
ee4eb13fff Update functions2.lib.php 2015-11-20 19:05:00 +02:00
Maxime Kohlhaas
9c1545bc1b NEW add info page on product card 2015-11-19 14:45:05 +01:00
philippe grand
4f280f63d0 [Qual] Uniformize code 2015-11-19 13:59:58 +01:00
aspangaro
b7b25c9682 Remove some code 2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-17 20:34:37 +01:00
Nikos Drosis
5082b1cc66 Fix for utf-8 characters in the mask mercure 2015-11-17 20:22:27 +02:00
BENKE Charlie
ce367bfa31 bad limittoshow usage 
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
 2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank 
account on PDF.
 2015-11-14 14:56:44 +01:00
Laurent Destailleur
5e67eefff3 Removed phpcs warning 2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
682842f15f Fix into title of login page, we must report the tru dolibarr version 
after the @ (technical information), event if application name/version
was replaced with a constant.
 2015-11-13 10:37:51 +01:00
aspangaro
0f75d76296 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar 
level wafter a click on a href link, just add the class "reposition" on
this link.
 2015-11-13 03:35:55 +01:00
Laurent Destailleur
7d9fde803b Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter 
NEW Develop multi type event filter
 2015-11-13 02:27:53 +01:00
Laurent Destailleur
4065b3f1df Better management of the Dolibarr tracking id into email. 
This will allow an imap scanner to link email
 2015-11-13 00:19:11 +01:00
Alexis Algoud
a2c8c7c20e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter 2015-11-12 09:05:26 +01:00
aspangaro
7693b407e8 HRM: Begin to work on employee card 2015-11-12 06:59:40 +01:00
Alexis Algoud
99513ac9f3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter 2015-11-09 18:31:21 +01:00
Alexis Algoud
68cbd4699b NEW multi event type for filter and get form in order to allow bookmark 2015-11-09 17:18:23 +01:00
Marcos García de La Fuente
7ebe032d6f FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname 
Close #3865
 2015-11-08 16:01:12 +01:00
Marcos García de La Fuente
4a52d3c1b1 Removed unwanted change 2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e FIX #3836 Unable to upload a document to an invoice under some circunstances 2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
Laurent Destailleur
99f5211070 NEW Can use the * as a joker characters into search boxes of lists 2015-11-07 11:48:35 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Laurent Destailleur
0f358eea49 Fix path definition of thumbs with the new function 2015-11-06 01:56:56 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place 
Conflicts:
	htdocs/comm/mailing/card.php
 2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136 FIX Storing and deleting files on emailing was done at wrong place 2015-11-05 03:02:31 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos 
Escpos Receipt printer
 2015-11-05 02:18:09 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Laurent Destailleur
b8ffa56497 Fix #3857 2015-11-02 19:49:00 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Laurent Destailleur
c06c2d0464 FIX #3841 creation of a task completed has not status set to finished by 
default
 2015-11-02 14:21:45 +01:00
Laurent Destailleur
a14fee7296 Merge pull request #3852 from hregis/develop_origin 
FIX add Mac OS detection and show it into OS information of user popup
 2015-11-02 11:26:20 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option. 
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
 2015-11-02 10:09:09 +01:00
Laurent Destailleur
6fe43cbbeb Removed dead code 2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 08:57:01 +01:00
Regis Houssin
0fd7ba478a Fix: add Mac OS 2015-11-01 17:27:41 +01:00
Laurent Destailleur
6482a4ee04 Minor css fix 2015-10-30 20:04:03 +01:00
Juanjo Menent
c14349f1ea Merge pull request #3829 from hregis/3.8_bug 
Fix: add missing hooks
 2015-10-29 16:05:35 +01:00
Regis Houssin
6373c82559 Fix: broken features !!! 2015-10-29 13:14:38 +01:00
Regis Houssin
e5b1e214bc Fix: add missing hooks 2015-10-29 11:50:16 +01:00
fmarcet
62dc6814a3 FIX #3726 Not showing images on product card 2015-10-29 10:14:54 +01:00
Marcos García de La Fuente
eff1f73950 Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#	htdocs/product/price.php
 2015-10-27 10:41:50 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function 
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
 2015-10-25 19:31:42 +01:00
Laurent Destailleur
3015a0388a NEW List of projects of a thirdparty are visible on a project tab 2015-10-24 16:09:26 +02:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
2615e02e1e Update doc 2015-10-22 13:18:51 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
BENKE Charlie
ec9955986f Update admin.lib.php 2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747 Update admin.lib.php 2015-10-21 05:06:19 +02:00
Laurent Destailleur
b5e633ef42 Size too small 2015-10-20 00:52:53 +02:00
Laurent Destailleur
e70bb28be7 If firstname not define, use lastname 2015-10-20 00:47:35 +02:00
Laurent Destailleur
23d7d60d73 Better compatibility with old versions 2015-10-20 00:22:28 +02:00
Maxime Kohlhaas
158281b14c Fix : minor typo 2015-10-19 17:13:02 +02:00
Marcos García de La Fuente
e7e152c122 NEW Level multiprice generator based on per cent variations over base price 2015-10-19 15:13:19 +02:00
Laurent Destailleur
bbbd5f5202 Fix removed var_dump 2015-10-19 14:55:01 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm 
Conflicts:
	htdocs/user/card.php
 2015-10-17 07:19:46 +02:00
Laurent Destailleur
df0c6aa5cf Use the new card banner for members 2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
8a32041f16 Clean CSS when option MAIN_MAXTABS_IN_CARD is set 2015-10-15 13:31:44 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
00c8b27baf Add code comment 2015-10-14 22:04:54 +02:00
Laurent Destailleur
6520ed7a08 Use css not bold title. 
Add missing badge (count of draft records) on draft list.
 2015-10-13 14:09:14 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
aspangaro
0b54cc4509 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-11 21:05:15 +02:00
Laurent Destailleur
618e5f0419 FIX no need to remove file into mail form #3573 2015-10-11 20:47:31 +02:00
Laurent Destailleur
87fad70f4a Revert "FIX no need to remove file into mail form" 2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08 Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file 
FIX no need to remove file into mail form
 2015-10-11 20:42:42 +02:00
Laurent Destailleur
9a6ac4f457 CSS enhancement 2015-10-11 16:32:46 +02:00
Laurent Destailleur
7fae9450a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Marcos García de La Fuente
4e9a378f0d Merge branch '3.6' into bug-1776 2015-10-11 12:37:41 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Laurent Destailleur
fb50daaa40 Fix bad parameter 2015-10-10 16:09:01 +02:00
Laurent Destailleur
0222867a94 The new banner for tab is moved into a shared functions 2015-10-10 12:01:09 +02:00
aspangaro
cd7c5645c7 Add library 2015-10-10 06:38:42 +02:00
Laurent Destailleur
f4f7629037 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511 Start to work on a common banner for tabs (goal is to have a nicer and 
generic part for all element)
 2015-10-10 01:51:12 +02:00
Laurent Destailleur
82428fea68 NEW: Only arrow of current sorted field is visible into table views. 
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
 2015-10-09 13:01:50 +02:00
Laurent Destailleur
2fc11a289e When there is no contact, no need to show filters 2015-10-09 00:30:02 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Laurent Destailleur
6ea05aa311 FIX Bad translation key for project "Overview" 2015-10-06 16:03:47 +02:00
Laurent Destailleur
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Laurent Destailleur
17416dba89 Merge pull request #3651 from frederic34/patch-20 
Add badge for number of files in bank's tab
 2015-10-04 20:03:41 +02:00
Frédéric FRANCE
780a5a1996 Update files.lib.php 2015-10-04 19:59:26 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
5d10fc2c77 Merge pull request #3644 from frederic34/patch-14 
can't access documents for bank
 2015-10-03 15:57:58 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Frédéric FRANCE
7da49a3592 Add badge for number of files in bank's tab 2015-10-03 12:09:42 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX error in SQL due to a previous fix
 2015-10-01 10:35:07 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop 
FIX there is no way to hide or change qty by hook
 2015-10-01 10:27:26 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
Alexis ALGOUD
453ed8a05e FIX error in SQL due to a previous fix 2015-09-28 15:36:27 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
1e2d06bcd1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-27 16:02:44 +02:00
Laurent Destailleur
ff5f823bef FIX not responsive part for project page 2015-09-27 16:01:57 +02:00
Alexis Algoud
688d6e37e2 FIX there is no way to hide or change qty to useful information by module 2015-09-26 14:42:26 +02:00
Laurent Destailleur
d119e04963 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 14:17:02 +02:00
Laurent Destailleur
c707c899c1 Fix remove warning 2015-09-26 13:22:05 +02:00
Laurent Destailleur
a3647bea4e Fix bad information in report 2015-09-26 11:53:36 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
Juanjo Menent
ef161e356e Merge pull request #3590 from GPCsolutions/json 
[Qual] Replaced deprecated dol_json_*()
 2015-09-26 08:42:13 +02:00
Juanjo Menent
dd19029279 Merge pull request #3589 from GPCsolutions/moduletabs 
[Qual] Warning on deprecated number of values
 2015-09-26 08:41:33 +02:00
Juanjo Menent
4f187d3413 Merge pull request #3588 from GPCsolutions/microtime 
[Qual] Replaced deprecated dol_microtime_float()
 2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00
Juanjo Menent
93c0adf725 Merge pull request #3583 from GPCsolutions/clone 
[Qual] Replaced deprecated dol_clone by native clone
 2015-09-26 08:33:48 +02:00
Juanjo Menent
99a945882d Merge pull request #3576 from aspangaro/develop-67 
New : Salaries  - Add info card / add field datec / rename field user_creat to user_author
 2015-09-26 08:29:13 +02:00
Raphaël Doursenaud
85c34af019 [Qual] Replaced deprecated dol_json_*() 2015-09-24 18:57:05 +02:00
Raphaël Doursenaud
bbaa76fab1 [Qual] Warning on deprecated number of values 
Module tabs declarations now uses 6 values including permissions.
 2015-09-24 18:47:43 +02:00
Raphaël Doursenaud
65340667b6 [Qual] Replaced deprecated dol_microtime_float() 2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
philippe
9e185eec75 FIX: order ref must not be translated 2015-09-24 15:29:17 +02:00
aspangaro
9b97e31a09 Merge remote-tracking branch 'Upstream/develop' into develop-67 2015-09-23 21:09:28 +02:00
Laurent Destailleur
95daf14725 Merge branch 'patch-73' of https://github.com/defrance/dolibarr into 
defrance-patch-73

Conflicts:
	htdocs/core/lib/functions.lib.php
 2015-09-23 19:21:59 +02:00
tysauron
f3a28682ea For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 18:26:50 +02:00
Alexis Algoud
2d35124c71 FIX no need to remove file into mail form, the temp dir will be deleted after any sending 2015-09-23 11:11:19 +02:00
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
tysauron
f8f50b3071 For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 01:24:30 +02:00
tysauron
f1ab0d36c5 Chmod new file not old file 2015-09-23 00:32:30 +02:00
Laurent Destailleur
33f1dfd6f0 Merge pull request #3568 from tysauron/patch-4 
Chmod new file not old file
 2015-09-23 00:31:52 +02:00
tysauron
2d237cadc9 Chmod new file not old file 2015-09-22 22:37:31 +02:00
Laurent Destailleur
72d7671a1e Enhance CSS 2015-09-22 16:21:46 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget 
FIX Style of previous-next card when using dolidroid
 2015-09-18 15:51:27 +02:00
Laurent Destailleur
872b59f568 NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to 
enter pdf footer text with wysiwyg editor.
 2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer 
make some plugins not working.
 2015-09-18 12:10:47 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Marcos García de La Fuente
3818bff86a Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address 2015-09-16 12:49:05 +02:00
Laurent Destailleur
813667e564 Debug swith of ckeditor theme 2015-09-15 17:45:40 +02:00
Laurent Destailleur
1b836dc31e Merge pull request #3408 from aspangaro/develop-60 
New: CkEditor add possibility to choose skin
 2015-09-15 17:09:11 +02:00
BENKE Charlie
95cfce925f fix error on tabcollectors and enhance 
fix error on tabcollectors feature
add number of tabs present in tab collectors
 2015-09-15 03:33:27 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage 
Conflicts:
	htdocs/ftp/index.php
 2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
1396ed8f03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-10 12:12:55 +02:00
aspangaro
3a90bfa6d3 Merge remote-tracking branch 'Upstream/develop' into develop-60 2015-09-10 06:59:23 +02:00
Laurent Destailleur
41803cd868 Merge pull request #3470 from GPCsolutions/develop-3440 
Fix #3440 Only search for core modules in main path
 2015-09-09 20:53:25 +02:00
Laurent Destailleur
3c91b8c890 Force to select "use personalized value" to select a personalized screen 
option.
 2015-09-09 12:39:06 +02:00
Juanjo Menent
5d401f275c Merge pull request #3486 from GPCsolutions/debug 
Qual: remove debug output
 2015-09-08 19:54:42 +02:00
BENKE Charlie
e2a738bf54 New fonction complete_elementList_with_modules 
if contactelement is defined on module definition, add module on definition type of contact
 2015-09-08 13:11:26 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/memory.lib.php
 2015-09-08 10:33:33 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Laurent Destailleur
9667b6a7c6 Solve conflict of var name 2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c Fix memcached effect was lost because init was done each time. 2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
71b98ffc0e Qual: remove debug output 2015-09-07 17:15:41 +02:00
Raphaël Doursenaud
0a9f4a41f3 Qual: Removed dead code 2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
97f91d0ef9 Fix #3440 Only search core modules in main path 
Removed duplicated code and used common dolGetModulesDirs() function
 2015-09-05 12:37:43 +02:00
Laurent Destailleur
c03d508bd3 Merge pull request #3467 from guerrierk/develop 
NEW Adding Document tab into Bank Account
 2015-09-05 10:26:51 +02:00
Laurent Destailleur
2a8ebcefcc Merge pull request #3412 from gschratzer/develop 
NEW update actions_sendmails.inc.php  files.inc.php
 2015-09-04 23:38:01 +02:00
GUERRIER Kevin
692fdbaec4 Adding Document tab into Bank Account 2015-09-04 21:29:16 +02:00
Raphaël Doursenaud
1ffb28a460 Fixed mobile detect classname without autoloader 2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
0eb0f52b6d Install mobiledetect from composer 2015-09-04 19:06:01 +02:00
Laurent Destailleur
dcaef54f9b Fix can't disable a module that were removed. 2015-09-04 16:47:43 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Laurent Destailleur
7a78c9d704 Fix doxygen 2015-09-01 14:31:32 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
BENKE Charlie
5ee00cf97b change made 2015-08-31 05:09:21 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
Marcos García
3482031b8a Removed second odd test 2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383 Removed odd test 2015-08-29 21:41:15 +02:00
Laurent Destailleur
c8f12dc5f2 Fix PUT method for already formated strings 2015-08-29 15:12:31 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" 
This reverts commit 2527ae263b.
 2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Niklas Spanring
53a02e5863 Fix: travis-ci error files.lib.php 
error line="215" message="There must be no blank lines after the function comment"
error line="217" message="Arguments with default values must be at the end of the argument list"
error line="248" message="The use of function sizeof() is forbidden; use count() instead"
error line="303" message="The use of function sizeof() is forbidden; use count() instead"
error line="447" message="The use of function sizeof() is forbidden; use count() instead"
error line="456" message="The use of function sizeof() is forbidden; use count() instead"
error line="465" message="The use of function sizeof() is forbidden; use count() instead"
error line="474" message="The use of function sizeof() is forbidden; use count() instead" 
error line="483" message="The use of function sizeof() is forbidden; use count() instead"
error line="494" message="The use of function sizeof() is forbidden; use count() instead"
error line="510" message="There must be no blank lines after the function comment"
 2015-08-26 15:12:17 +02:00
Laurent Destailleur
3fc63eba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-26 11:25:05 +02:00
Laurent Destailleur
3db021addf Fix Use correct boolean type. 
Complete doxygen
 2015-08-26 11:24:31 +02:00
gschratzer
16268e9f0a New: function calculate_byte 2015-08-25 17:05:08 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Laurent Destailleur
1b409538a8 Fix #3400 
Conflicts:
	htdocs/core/lib/date.lib.php
 2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Laurent Destailleur
e24fd6fa37 Merge remote-tracking branch 'origin/develop' into 3.8 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2015-08-20 14:36:32 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because 
now linked objects return by fetchLinkedObject are associative array
with ID as key.
 2015-08-19 16:36:44 +02:00
philippe grand
61f6da0210 the form should be outside table to avoid errors 2015-08-15 16:07:59 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
BENKE Charlie
daa68efdd3 Update functions.lib.php 
better context change
 2015-08-14 23:23:44 +02:00
BENKE Charlie
a3db26adfd Update functions.lib.php 
change context init method
 2015-08-14 19:13:13 +02:00
Laurent Destailleur
5ed3d80103 Merge pull request #3385 from marcosgdf/bug-3321 
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
 2015-08-14 18:10:28 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
84d4cbdbcc Merge remote-tracking branch 'origin/3.7' into develop 2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc Remove dead code 2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284 Fix better translation 2015-08-14 13:04:35 +02:00
Marcos García de La Fuente
b3a7b44046 FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights 
Close #3321
 2015-08-14 12:29:32 +02:00
Laurent Destailleur
811169b2ae Fix: do not show desc if empty 2015-08-13 01:26:25 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided" 
This reverts commit 2cf9d9f583.
 2015-08-12 23:18:07 +02:00
Juanjo Menent
993037ec9e Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab 
NEW : print event type on third party card tab agenda list (only if A…
 2015-08-12 18:25:20 +02:00
BENKE Charlie
6801504755 Update functions.lib.php 
some bugs sorry
 2015-08-11 23:51:02 +02:00
BENKE Charlie
049805e926 Update functions.lib.php 
Div enough on sub-menu case (project/task)
 2015-08-10 19:47:12 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
BENKE Charlie
187c40aca9 Update functions.lib.php 2015-08-06 18:20:09 +02:00
BENKE Charlie
f5d4cc5f89 Update functions.lib.php 2015-08-06 16:23:34 +02:00
BENKE Charlie
4709a51c84 Add number of collected tabs and hook/trigger 
Add number of collected tabs 
Add trigger based on tabs name
add hook at end of tabs and at the footer of page
 2015-08-05 15:19:00 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided 
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
 2015-08-03 10:30:10 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
a16d6b037c Fix: bad link to task 2015-07-28 12:06:57 +02:00
Florian HENRY
517e9094da FIX : Avoid warning strict mode when hosting server do not have 
php5_curl installed
 2015-07-27 22:34:30 +02:00
Laurent Destailleur
d128cf69d9 Doxygen doc 2015-07-27 17:09:16 +02:00
Laurent Destailleur
814cec880a Fix filter can be empty 2015-07-21 13:38:24 +02:00
Gauthier
f18c983ba5 NEW : print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1) 
Conflicts:
	htdocs/core/lib/company.lib.php
 2015-07-21 11:06:00 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00