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

6923 Commits

Author SHA1 Message Date
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Christophe Battarel
d0dc792b3c check extrafields before inserting in DB 2014-11-17 11:17:45 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
 2014-11-16 15:46:08 +01:00
Laurent Destailleur
64a2cce7c0 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-16 14:11:19 +01:00
Laurent Destailleur
d4ad7236e5 Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
Laurent Destailleur
539a201d3e Fix: doxygen 2014-11-15 18:30:37 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
741adc79b2 Fix: Bugs reported by scrutinizer 2014-11-15 17:05:43 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
2aeb0f4f5b Merge pull request #1941 from jfefe/patch-3 
Avoid missing class error for fetch_thirdparty method
 2014-11-15 12:36:41 +01:00
Laurent Destailleur
e53157b28b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-15 00:57:50 +01:00
Laurent Destailleur
a46a6cccaf Fix: Screen page tests. Page tests are now ok with 3.7. 2014-11-15 00:57:31 +01:00
Laurent Destailleur
425a853e07 - New: Match other auth system: Login can be done entering login or 
user email (this open the road for SSO).
 2014-11-14 11:56:05 +01:00
Laurent Destailleur
6bac744709 Fix: Missing event management into select when combo not selected 2014-11-13 16:46:40 +01:00
Florian HENRY
c0a3606a59 Fix problem on task creation with chrome for french browser. 2014-11-12 22:53:23 +01:00
Laurent Destailleur
d164b2d0e1 Fix: Showing capital 2014-11-12 10:37:39 +01:00
Laurent Destailleur
608fa5eaed Fix: Avoid to load language when we can not. 2014-11-12 10:25:56 +01:00
Laurent Destailleur
47ebe21f7b Fix: Removed unused property 2014-11-11 23:38:56 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
1dcca6e553 Avoid error 2014-11-08 00:49:52 +01:00
Laurent Destailleur
429cae5d2e Recherche bug travis 2014-11-07 23:58:30 +01:00
Laurent Destailleur
4c1b1408ed Fix: Removed duplicate menu entry 2014-11-07 23:15:02 +01:00
Laurent Destailleur
8a89997c79 Fix: bug into edition of extrafields 2014-11-07 22:40:13 +01:00
Laurent Destailleur
3d5a45e274 Fix: textarea too small 2014-11-07 22:19:31 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos 
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
 2014-11-07 21:47:06 +01:00
Laurent Destailleur
5ad6b69ce9 Merge pull request #2006 from frederic34/patch-1 
Update antispamimage.php
 2014-11-07 21:45:08 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab 
notifications
 2014-11-06 11:20:47 +01:00
Frédéric FRANCE
4cb3dc4238 Update antispamimage.php 
If imagecreate fail, we can't see error message
 2014-11-05 20:02:58 +01:00
Laurent Destailleur
cc1b14e9f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-05 17:42:11 +01:00
Laurent Destailleur
b601afc92b Merge pull request #1994 from aspangaro/develop-patch 
Update module accounting
 2014-11-05 17:40:51 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
Laurent Destailleur
f7e71d8848 Fix: checkstyle 2014-11-05 16:23:10 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
5c2862dae3 Merge pull request #1976 from frederic34/patch-2 
Add a little delay in ajax_autocompleter
 2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b Merge pull request #1993 from aspangaro/3.6-patch 
GPLv3
 2014-11-04 17:40:38 +01:00
Laurent Destailleur
26bd214e72 Merge pull request #1996 from aspangaro/develop-search 
Increase list search
 2014-11-04 17:40:11 +01:00
Laurent Destailleur
c41e908dba Merge pull request #2000 from Devensys/Develop-MajPasswordPattern 
New modGeneratePass with personal conf
 2014-11-04 17:37:25 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached 
to user.
 2014-11-04 13:54:18 +01:00
Andrelec1
796f2409a1 Add verif and correction lang 2014-11-04 11:38:16 +01:00
Laurent Destailleur
0b41df7c35 Clean code to manage multiselect jquery: All code is centralized 
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
 2014-11-04 00:33:50 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
b6b6cced30 Fix: Test sur user assigned not filled 
Can use empty line into select boolean form.
 2014-11-03 20:02:11 +01:00
Laurent Destailleur
a4a01de8a1 Fix: Missing label 2014-11-03 18:00:11 +01:00
Andrelec1
5074feacd6 Add option and create new class 2014-11-03 17:57:55 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
aspangaro
29c6797835 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 06:15:45 +01:00
Laurent Destailleur
ddf737daed Removed deprecated page and option. 2014-11-03 01:07:07 +01:00
aspangaro
a1980a1917 Correct travis error - Not me ! 2014-11-02 22:04:01 +01:00
Laurent Destailleur
627f5694f0 Fix: Infinite loop 2014-11-02 21:19:00 +01:00
Laurent Destailleur
1f4f2291f6 Start module with status experimental 2014-11-02 21:18:16 +01:00
Laurent Destailleur
84653f70be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-02 21:16:56 +01:00
Laurent Destailleur
5a18904bb4 Fix: Infinite loop 2014-11-02 21:16:31 +01:00
Laurent Destailleur
2b8abf2794 Fix: Missing label 2014-11-02 20:07:38 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Laurent Destailleur
167ec6917a Can add prefix into generated filename. This will save time for script 
to build kit of files for book keeper.
 2014-11-01 20:15:51 +01:00
Laurent Destailleur
53dfda1413 Fix: Chars - is no more allowed into value for code for extra fields. 2014-11-01 19:34:20 +01:00
aspangaro
24d0568e5a Merge remote-tracking branch 'Upstream/develop' into develop-patch 2014-10-31 21:21:52 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
aspangaro
e43de8b815 Update module accounting 2014-10-31 07:37:59 +01:00
Ion Agorria
557cbaf3d7 Added module descriptor and activation checks 
Corrected 3 missing $error_occurred flags
 2014-10-31 04:59:57 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Frédéric FRANCE
08e958152c Update ajax.lib.php 2014-10-30 18:45:47 +01:00
Frédéric FRANCE
f18e513046 Update html.form.class.php 2014-10-30 18:44:56 +01:00
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4 
On/Off for Object (do not restrict to product)
 2014-10-30 18:21:50 +01:00
Laurent Destailleur
82812aa679 Merge pull request #1970 from FHenry/develop 
Add hook method to simply display child lines in order/invoice/propal
 2014-10-30 18:11:41 +01:00
Laurent Destailleur
3e12239f11 Merge pull request #1971 from defrance69/patch-25 
Update commondocgenerator.class.php
 2014-10-30 18:10:52 +01:00
Laurent Destailleur
9d9a1e0701 Merge pull request #1974 from grandoc/develop 
encrease name length for societe
 2014-10-30 18:04:38 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6 
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
 2014-10-30 17:56:22 +01:00
Laurent Destailleur
d6c1b71350 Merge pull request #1983 from atm-maxime/mkoevols 
Fixes on extrafields, product supplier prices and user / company association deletion
 2014-10-30 17:49:53 +01:00
Laurent Destailleur
3ffd4432df New: Add permissions to read all trips and expenses. 2014-10-30 11:43:57 +01:00
Laurent Destailleur
750944d718 Fix: var not initialised 2014-10-30 11:16:01 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Florian HENRY
d846dd2431 Fix extrafield from list feature where filter is provided 2014-10-27 19:38:27 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Maxime Kohlhaas
7b7b7e79e9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 
Conflicts:
	htdocs/core/lib/company.lib.php
 2014-10-27 11:17:44 +01:00
Maxime Kohlhaas
fda32f6638 FixDosFiles 2014-10-27 11:16:18 +01:00
Maxime Kohlhaas
efd99a6f44 Fix : extrafield errors 2014-10-27 10:20:35 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
7bd27a13fa Fix: missing host and port into object 2014-10-26 19:41:06 +01:00
MAxime Kohlhaas
374b761fdf Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:20:02 +02:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Frédéric FRANCE
b2a9b48a78 Update ajax.lib.php 
Add a delay before making request, may avoid multiple request to server when typing search request
 2014-10-24 10:40:48 +02:00
Philippe GRAND
463904706b better display margin infos 2014-10-23 15:02:49 +02:00
BENKE Charles
10f419e372 error on adding fields (bad function 2014-10-23 13:08:39 +02:00
jfefe
29db45c763 Avoid missing class error for fetch_thirdparty method 2014-10-23 01:15:05 +02:00
BENKE Charles
c103a5927a Update commondocgenerator.class.php 
add : outstanding limit on ODT 
fix  : only public note are display on ODT (private stay private)
 2014-10-20 22:28:08 +02:00
Florian HENRY
1eba744e8b Add hook method to simply display child lines in order/invoice/propal 2014-10-20 13:15:48 +02:00
Laurent Destailleur
4df9fb38fb Add option AGENDA_ALWAYS_HIDE_AUTO 2014-10-20 12:29:35 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Frédéric FRANCE
5b9a134d69 Update objectonoff.php 2014-10-18 22:47:12 +02:00
Frédéric FRANCE
a1bedcc263 Update ajax.lib.php 2014-10-18 22:46:13 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Frédéric FRANCE
eefb211be7 Update ajax.lib.php 2014-10-18 18:48:13 +02:00
Frédéric FRANCE
8bb0ce0f7f Update ajax.lib.php 2014-10-18 17:17:41 +02:00
Frédéric FRANCE
489045d715 Rename productonoff.php to objectonoff.php 2014-10-18 17:11:47 +02:00
Frédéric FRANCE
dd5ea670e2 Update ajax.lib.php 2014-10-18 17:11:02 +02:00
Frédéric FRANCE
2107a61bbe Update ajax.lib.php 
For use in a list of object
 2014-10-18 16:32:32 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Laurent Destailleur
873f8a6f27 If there is at least one favorite into countries, then add a separator 
into list to show limit between sorted entries and not sorted entries.
 2014-10-18 15:53:42 +02:00
Frédéric FRANCE
96aee6eed4 Update ajax.lib.php 2014-10-18 15:48:59 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Laurent Destailleur
97f98d7e16 Merge pull request #1955 from frederic34/patch-2 
Ajax On/Off for product tosell and tobuy
 2014-10-18 14:18:14 +02:00
Laurent Destailleur
fb76fc94b5 Merge pull request #1963 from defrance69/patch-24 
Update functions2.lib.php
 2014-10-18 14:11:25 +02:00
Laurent Destailleur
b43d96f86c New: Add id into select_category method. 2014-10-18 02:12:10 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
Laurent Destailleur
a2d23fd699 Fix: Error management of hook was duplicating errors. 2014-10-18 00:33:30 +02:00
BENKE Charles
8095bbf809 Update functions2.lib.php 2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa Fix: avoid warning 2014-10-17 16:23:32 +02:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
Laurent Destailleur
8581e953f9 Doxygen 2014-10-17 14:45:12 +02:00
BENKE Charles
589a3fdf95 Update functions2.lib.php 2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d Update functions2.lib.php 
disable entity filter fields for module who not use multicompany fields
 2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Maxime Kohlhaas
8e3a3500c2 Add comments (for travis' sake) 2014-10-16 13:28:39 +02:00
Laurent Destailleur
c8dd0383d8 New: Function getCurrencyAmount is marked as deprecated. Use function 
price to output a price including currency symbol.
 2014-10-16 01:26:44 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00
Laurent Destailleur
b90011aeb1 Add function dolEscapeXML 2014-10-16 01:21:10 +02:00
Laurent Destailleur
efa171819a Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-10-16 01:19:33 +02:00
Laurent Destailleur
756b1d31ad Add function dolEscapeXML 2014-10-16 01:01:30 +02:00
Laurent Destailleur
5d57c59241 Fix: Bad parameter of get_substitutionarray_other 2014-10-15 18:16:41 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Laurent Destailleur
536b579b35 Clean code 2014-10-14 00:27:23 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
86d25146cc Qual: Indentation muse be done with css and not using multiple   
spaces.
 2014-10-13 00:17:37 +02:00
Laurent Destailleur
e101bfceea Use language to find template email. 2014-10-12 21:24:51 +02:00
aspangaro
dc6817813e Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 20:23:08 +02:00
Regis Houssin
104592b349 Fix: wrong function name 2014-10-12 19:08:34 +02:00
Frédéric FRANCE
7f308bf9b5 Update productonoff.php 2014-10-12 17:00:42 +02:00
Frédéric FRANCE
33bb150b44 Update productonoff.php 2014-10-12 16:30:58 +02:00
Laurent Destailleur
8df8fb2fe0 Qual: Removed a lot of duplicate code 
New: extrafields for projects and tasks are exported to ODT documents.
 2014-10-12 16:19:00 +02:00
Frédéric FRANCE
f5f50045d6 Update ajax.lib.php 2014-10-12 16:09:42 +02:00
Frédéric FRANCE
052e507271 Update productonoff.php 2014-10-12 15:56:04 +02:00
Frédéric FRANCE
f25c4f18e6 Update ajax.lib.php 2014-10-12 15:55:18 +02:00
Laurent Destailleur
30e27014b8 Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:14 +02:00
aspangaro
dad9a54959 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
5c07df812d Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Frédéric FRANCE
77d7764215 Create productonoff.php 2014-10-12 14:22:32 +02:00
Frédéric FRANCE
e6e953b4d8 Update ajax.lib.php 2014-10-12 14:20:49 +02:00
Laurent Destailleur
65f47f7d10 New: Add number of active notification into tab title (like we do for 
notes and documents)
 2014-10-12 12:22:45 +02:00
Laurent Destailleur
f08759a17e Fix: area to generate doc must use half size not onethird. 
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
 2014-10-12 11:59:52 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/date.lib.php
 2014-10-12 02:13:38 +02:00
Laurent Destailleur
591b40e674 Some fix with export definition. Works now with pgql too. 2014-10-12 01:59:21 +02:00
Laurent Destailleur
a69fb2126c Merge pull request #1861 from defrance69/patch-20 
Update modContrat.class.php
 2014-10-12 01:40:00 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages. 
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
 2014-10-12 01:04:34 +02:00
Laurent Destailleur
6c3c1d3a0a Merge pull request #1930 from GPCsolutions/reportprogress 
Allow reporting progress along with timespent
 2014-10-12 00:10:28 +02:00
Laurent Destailleur
e9881997ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-11 23:50:27 +02:00
Laurent Destailleur
52e1bd2ad1 Merge 2014-10-11 23:46:49 +02:00
Laurent Destailleur
77ed7bf5df Merge branch 'develop-HiddenMailPasswordForgotten' of 
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-10-11 23:44:50 +02:00
Laurent Destailleur
a9e6e93c59 Merge pull request #1953 from jfefe/patch-6 
Allow to make PUT request with getURLContent() function
 2014-10-11 23:32:25 +02:00
Laurent Destailleur
2800faffa8 Fix: File names must be in lowercase. 
Fix: Missing includes.
 2014-10-11 18:27:30 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
jfefe
eb06c8a33e Allow to make PUT request with getURLContent() function 2014-10-11 04:25:32 +02:00
Andrelec1
269b960d9a Add support tld with dots 2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a copyright and annotation 2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d Add function hideMail and use 2014-10-10 14:57:07 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Laurent Destailleur
56f5c666cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 15:09:32 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have 
the same name as the module
 2014-10-08 14:51:16 +02:00
jfefe
6a4468d94e Not need to test if class exists with require_once 2014-10-06 14:18:28 +02:00
jfefe
87fc27c7e6 Avoid missing class error for fetch_thirdparty method 2014-10-06 13:31:01 +02:00
Laurent Destailleur
60f643cf1a Change comented log to help debug 2014-10-05 20:26:35 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
bb852592e6 Fix: Restore broken feature. One hook = One call of function per module. 2014-10-05 04:49:46 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
e70aebf2c7 Merge pull request #1937 from fappels/develop 
Expedition lines from same orderline merged.
 2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Francis Appels
bcc5bebd77 Fix deliveryorder qty and remainingqty positions 2014-10-03 12:28:42 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Laurent Destailleur
c69565fd69 Fix: column name should not be an numeric 2014-10-03 03:12:39 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Laurent Destailleur
7fb2d4d1c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 01:48:28 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Regis Houssin
1541be8790 FIXME $key is not defined (strict mode) 2014-10-02 08:40:51 +02:00
Raphaël Doursenaud
769d824e7b Allow reporting progress along with timespent 2014-10-01 14:12:47 +02:00
Laurent Destailleur
ec2a8b5551 Merge pull request #1800 from Devensys/Develop-HighlitingIBAN 
Highliting IBAN (sepa)
 2014-09-29 16:43:22 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Regis Houssin
3d82f0965e Fix: Try to filter by context, use the test with $currentcontext in 
method for avoid to run twice (I have not found any other solution!)
 2014-09-29 15:20:54 +02:00
Regis Houssin
334cdf7dca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:41:17 +02:00
Regis Houssin
c5a7dfbabb Fix: Add current context for avoid method execution in bad context, you 
can add this test in your method : eg if($currentcontext != 'formfile')
return;
 2014-09-29 14:40:02 +02:00
Laurent Destailleur
e0aa140960 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:01:40 +02:00
Laurent Destailleur
8ccb581185 Fix: Change for php 5.6 
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
 2014-09-29 13:21:03 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
Laurent Destailleur
06494b085a Perf enhancement 2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d Uniformize code. 2014-09-28 16:31:37 +02:00
Laurent Destailleur
2b95bd2fcc Fix: Link to linked object was not working for invoice and order. 
Fix: end date
 2014-09-28 16:12:38 +02:00
Regis Houssin
f527602753 Fix: use specific css style instead, this causes a shift problem 2014-09-28 13:12:51 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
8e95f2e223 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-26 12:42:41 +02:00
Laurent Destailleur
bf4b99fa64 Assignation of event to several users is on a very good way for 3.7 2014-09-26 12:27:18 +02:00
Regis Houssin
3ab8b6f7d1 New: add possibility to define a custom error message 2014-09-26 09:44:21 +02:00
Regis Houssin
44cecb8e7d Fix: add possibility to use element id 2014-09-26 09:20:02 +02:00
Regis Houssin
64b757ed81 Fix: add generic doc and use doc dir instead pdf 2014-09-25 12:44:57 +02:00
Florian HENRY
f9fb73ee82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-24 10:04:01 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00
Laurent Destailleur
7224f64224 Work on multi user for events. 
Fix: Modules must be reloaded after migration.
 2014-09-23 16:15:15 +02:00
Laurent Destailleur
65a486a48b Merge pull request #1897 from Cubexed/develop-patch-2 
Closed projects are greyed out in project selector
 2014-09-23 00:08:46 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
e1fec958ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/group/fiche.php
 2014-09-22 23:43:22 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:34:56 +02:00
Laurent Destailleur
b73fe26d6e Merge pull request #1913 from atm-alexis/feature_extrafields_on_group 
ADD extrafields on usergroup
 2014-09-22 23:24:52 +02:00
Laurent Destailleur
469ff4320a Uniformize export profiles. 2014-09-22 21:46:46 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
Alexis Algoud
de0d53a2bb ADD extrafields on usergroup 2014-09-22 16:31:58 +02:00
Marcos García de La Fuente
8f492a6677 Documented commonObject::commonGenerateDocument 2014-09-22 00:18:36 +02:00
Marcos García de La Fuente
9244ef23af Removed 2nd argument of muscadet and canelle model __construct function 2014-09-22 00:08:21 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-20 06:36:31 +02:00
Laurent Destailleur
cf7973d0fa Doxygen 2014-09-20 01:26:53 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
Laurent Destailleur
2a9275d0de Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/societe/consumption.php
 2014-09-19 11:09:51 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
2b602e7b5a Qual: Uniformize param names. contactidp -> contactid 2014-09-18 18:46:00 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
fd890c0b81 Merge pull request #1878 from Cubexed/develop 
This commit adds a way to filter projects by checking if selected year is in creation/ending range.
 2014-09-18 17:47:12 +02:00
Laurent Destailleur
46f117b0f9 Merge pull request #1902 from atm-maxime/mko_workonlists 
Work on lists
 2014-09-18 17:29:15 +02:00
Laurent Destailleur
ea3d091f03 Merge pull request #1900 from ndrosis/patch-5 
Correct view greek language in PDF
 2014-09-18 17:25:44 +02:00
Laurent Destailleur
6c522f8772 Merge pull request #1898 from GPCsolutions/ciforeveryone 
Fixed typo
 2014-09-18 17:25:18 +02:00
Laurent Destailleur
99f1876aa2 Merge pull request #1903 from aspangaro/develop-accounting 
Patch Accounting Expert module
 2014-09-18 17:24:40 +02:00
Laurent Destailleur
49db9d1304 Fix: Avoid explode when separator : is not. 2014-09-18 17:12:51 +02:00
Laurent Destailleur
5a14a44100 Doxygen 2014-09-18 11:13:23 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Laurent Destailleur
dfa071e093 Fix: Are description too large 2014-09-18 01:43:50 +02:00
Laurent Destailleur
47d423aae4 Fix: Minor fix into intervention card 2014-09-18 00:21:25 +02:00
Maxime Kohlhaas
64fe082539 New generic functions for search pictos, to be used in every lists 2014-09-17 17:59:00 +02:00
Laurent Destailleur
f0ebd7721d Fix: Restore sort feature. Still did not see why previous commit is a 
bug fix of dolibarr bug.
 2014-09-17 17:49:39 +02:00
Laurent Destailleur
3a11a46101 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-17 17:38:49 +02:00
Laurent Destailleur
12ae552486 Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
Drosis Nikos
de6e1c5036 Correct view greek language in PDF 2014-09-17 18:01:59 +03:00
Raphaël Doursenaud
c15849df2d Fixed typo 2014-09-17 16:40:35 +02:00
Regis Houssin
099daf4296 Fix: remove hook restriction ! 2014-09-17 16:08:58 +02:00
Regis Houssin
f185028707 Fix: remove hook restriction ! 2014-09-17 16:08:14 +02:00
Regis Houssin
c6b5d0f96c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-09-17 16:07:21 +02:00
Regis Houssin
d225d92c0b Fix: remove hook restriction ! 2014-09-17 16:03:21 +02:00
Cubexed
9ed77c6060 Closed projects are greyed out in project selector 2014-09-17 15:42:48 +02:00
Cubexed
fe9e7a0fa9 Revert "Closed projects are greyed out in project selector" 
This reverts commit 68994823dd.
 2014-09-17 15:41:46 +02:00
Laurent Destailleur
900cdd5368 Qual: Removed duplicate page. 2014-09-17 15:24:01 +02:00
Laurent Destailleur
d976a5575b New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto 
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 2014-09-17 14:36:04 +02:00
Laurent Destailleur
6eb3fe1ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-17 01:13:20 +02:00
Laurent Destailleur
a834796181 New: Content of predefined email come firstly from table 
llx_c_email_template, then translation key.
 2014-09-17 01:12:59 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
aspangaro
28e20f1826 typo of link into eldy menu 2014-09-16 20:06:31 +02:00
Cubexed
c3b255bce9 Changed sql to be portable 2014-09-16 15:27:04 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Juanjo Menent
d1879c1b9f Qual: Remove unused code 2014-09-16 11:19:22 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
d8e8b34605 Fix: Removed AGENDA_DEFAULT_TYPE. There is already 
AGENDA_DEFAULT_FILTER_TYPE.
 2014-09-15 19:35:54 +02:00
Laurent Destailleur
8487913209 Fix: default setup of type of action 2014-09-15 19:27:45 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event. 
New: Onto event summary of elements, end date and status are visible.
 2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90 New: Add option AGENDA_DEFAULT_TYPE 
Fix: id is not set on field.
 2014-09-15 17:34:32 +02:00
Laurent Destailleur
7fc8799c3d Qual: Clean code from user table tr td 2014-09-15 16:18:19 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Laurent Destailleur
b94d913440 New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to 
automatically set end date of event to start date + delta on creation
page.
 2014-09-15 10:19:08 +02:00
Laurent Destailleur
6f718af1b6 Fix: list of interventions of thirdparties 2014-09-15 09:29:40 +02:00
Marcos García de La Fuente
7a28f8e4aa [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger 2014-09-14 13:59:06 +02:00
Laurent Destailleur
4e21891f14 Add lost PR 2014-09-14 12:06:38 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
2cfe088ee4 Better organization of accountancy menus 
Fix: sql error with pgsql
 2014-09-13 16:54:17 +02:00
Cubexed
68994823dd Closed projects are greyed out in project selector 2014-09-12 18:00:55 +02:00
Cubexed
71a1857b49 Ignore dateo/datee if is a null column 2014-09-12 16:46:19 +02:00
Cubexed
c23fab267c This commit adds a way to filter projects by checking if 
selected year is in creation/ending range.

The year input is shown after the list, outside the table.

It's hidden by default and must be
enabled with PROJECT_LIMIT_YEAR_RANGE
 2014-09-12 05:30:17 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Laurent Destailleur
7851587a11 Merge pull request #1869 from FHenry/3.6 
Extrafield feature select from table should try to translate multiple column when not needed
 2014-09-11 17:13:28 +02:00
aspangaro
4c52a6ee6f Add admin page into salaries to manage accountancy 2014-09-10 04:53:18 +02:00
aspangaro
8f818529a6 Remove right "accounting->access" & debug menu 2014-09-09 21:19:15 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
f19e469b5f Work on feature to assign several users to an event. 2014-09-09 14:38:10 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module. 
Can filter on date of event.
Local calendar renamed into Internal calendar.
 2014-09-09 12:28:35 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2 Fix: duplicate entity encoding into select_array. 2014-09-08 23:08:59 +02:00
aspangaro
1223be1e5b Move language key into admin.lang file 2014-09-08 21:51:40 +02:00
aspangaro
70b8ccd441 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-08 20:18:45 +02:00
Laurent Destailleur
a3bbf2aff9 Fix: Correct height of empty line for thirdparties combo list. 2014-09-08 12:05:24 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d Upgrade phpexcel lib to 1.7.8 2014-09-07 12:12:30 +02:00
aspangaro
02f45b7f43 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-07 07:32:47 +02:00
Laurent Destailleur
63bfc093c3 Search on a specific day is possible into per user view. 2014-09-06 17:55:33 +02:00
Laurent Destailleur
bf0b578e5a Fix: Sort at wrong place 
Fix: sql syntax error (field were renamed)
 2014-09-06 16:24:44 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
Laurent Destailleur
522b5a91bc Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:16:24 +02:00
Laurent Destailleur
a86de9b685 Work on agenda per user. 2014-09-05 21:12:01 +02:00
Laurent Destailleur
de0cf14ece Fix: Bad position of week 2014-09-05 15:10:31 +02:00
Laurent Destailleur
0e944b0403 Fix: Pb with week position when week start on sunday. 2014-09-05 15:00:53 +02:00
Laurent Destailleur
175e3eca6b Work on agenda view per user 2014-09-05 13:48:55 +02:00
Juanjo Menent
5b34897927 Merge pull request #1864 from aspangaro/develop-accounting 
Patch Accounting Expert module
 2014-09-05 09:06:34 +02:00
Laurent Destailleur
60c633fd8b Qual: Generalize hook afterPDFCreation. 
New: Add hook beforePDFCreation
 2014-09-04 23:24:19 +02:00
Laurent Destailleur
e7e48f6b2b Doxygen 
Add constant to enable bank during proposal (not enough common).
 2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505 Fix: Do not use &nbsp as value of a list 2014-09-04 19:27:59 +02:00
Florian HENRY
85cabbf921 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-04 18:29:17 +02:00
Laurent Destailleur
6da0077738 Fix: Not enough space 2014-09-04 15:48:49 +02:00
Laurent Destailleur
b88b4fbc2c Fix: bad balance of td 2014-09-04 15:17:15 +02:00
Laurent Destailleur
8ec61b8ac6 Fix: bad balance of td 2014-09-04 14:43:16 +02:00
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
32fd2e03ce More log into notify class 2014-09-04 14:38:30 +02:00
aspangaro
102e85e1e7 Merge branch 'Upstream/develop' 2014-09-04 04:34:04 +02:00
aspangaro
354aee2457 Modify eldy menu 2014-09-03 21:01:24 +02:00
aspangaro
1389f75933 Don't show journals of module comptabilite when accounting expert module is enabled 2014-09-03 20:32:38 +02:00
Laurent Destailleur
7021f4fb01 Fix: Message show when dir is out of sync with database cache was wrong. 2014-09-03 16:09:14 +02:00
Laurent Destailleur
be0c7ba28f Fix: Bad title 2014-09-03 09:55:06 +02:00
Laurent Destailleur
ca322942ae I remove the extend into commonobjectline to common object. 
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
 2014-09-03 09:49:50 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
Laurent Destailleur
0254edb426 Merge pull request #1858 from ndrosis/patch-4 
Can change size of Logo picture
 2014-09-02 19:15:59 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting 
Integration of module Accounting Expert
 2014-09-02 19:14:21 +02:00
Laurent Destailleur
4fdfe05168 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-02 12:46:57 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
BENKE Charles
05ed96f7fa Update modContrat.class.php 
add export contract/service feature
 2014-09-02 10:45:53 +02:00
Juanjo Menent
e6a387cb65 Merge pull request #1856 from aspangaro/develop-patch1 
Typo
 2014-09-01 18:44:09 +02:00
Laurent Destailleur
f245f43a3f Doxygen 2014-08-31 23:18:09 +02:00
Laurent Destailleur
f2affade35 Doxygen 2014-08-31 23:06:58 +02:00
Laurent Destailleur
de548ba610 Doxygen 2014-08-31 23:01:49 +02:00
Laurent Destailleur
6e54577167 Better error management 2014-08-31 15:09:10 +02:00
aspangaro
def53d92bd Correct error menu 2014-08-31 14:10:48 +02:00
aspangaro
6d3b166340 Update dynamics menu 2014-08-31 13:58:42 +02:00
aspangaro
f9076162b6 Add dynamic link into accountancy menu to bank journal 2014-08-31 08:56:22 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Drosis Nikos
445bac25fe Can change size of Logo picture 2014-08-30 23:57:37 +03:00
Laurent Destailleur
154d1520fb Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1 2014-08-30 20:36:53 +02:00
Laurent Destailleur
20475ba3e8 Fix: sql request not compatible with pgsql 
Conflicts:
	htdocs/core/ajax/ziptown.php
 2014-08-30 20:19:27 +02:00
Laurent Destailleur
0ccd29c6cd Doxygen 2014-08-30 20:05:16 +02:00
Laurent Destailleur
5738d6de98 Fix: sql request not compatible with pgsql 2014-08-30 20:04:53 +02:00
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
Laurent Destailleur
f6be7d7930 Fix: Pb with pgsql 2014-08-30 19:58:38 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
cc9f26a035 Correct travis 2014-08-30 05:44:12 +02:00
aspangaro
b27cf2cbd6 Merge branch 'Upstream/develop' 2014-08-30 05:30:53 +02:00
aspangaro
b25db97c28 Typo 2014-08-30 05:30:37 +02:00
aspangaro
1a7c88751c Correct travis 2014-08-30 05:19:48 +02:00
aspangaro
07377e7156 Merge branch 'Upstream/develop' 2014-08-30 04:42:36 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:25:54 +02:00
aspangaro
bc686a7995 Test Correct travis 2014-08-29 06:43:05 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Regis Houssin
ff04729a07 Fix: strict mode 2014-08-28 19:38:18 +02:00
Regis Houssin
1aad1b6acd Fix: strict mode 2014-08-28 19:32:41 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test 
Fix: debian readme to upgrade tcpdf lib.
 2014-08-28 16:59:10 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +02:00
Regis Houssin
139cf10c7c Fix: php strict mode saga 2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37 Fix: another strict mode alert 2014-08-28 15:36:57 +02:00
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
 2014-08-28 15:14:06 +02:00
Laurent Destailleur
a1e92b464f Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields 
Feature  : Add extrafields on intervention's lines
 2014-08-28 12:00:43 +02:00
Laurent Destailleur
013023204f Merge pull request #1841 from GPCsolutions/modules 
Modules classes documentation enhancements
 2014-08-28 11:58:13 +02:00
Laurent Destailleur
fbf51302dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 11:20:32 +02:00
Laurent Destailleur
a486b4e415 Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.
 2014-08-28 11:20:13 +02:00
aspangaro
bb45b8bbc5 Typo & admin menu 2014-08-28 07:37:29 +02:00
aspangaro
5b3be47b47 Merge branch 'Upstream/develop' 2014-08-28 07:28:45 +02:00
aspangaro
9b3a3a47c2 Add link chart of accounts in administration 2014-08-28 07:18:28 +02:00
aspangaro
6f8234dd60 Update Eldy menu 2014-08-28 07:13:33 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:01 +02:00
Regis Houssin
76cb6f760a Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:02:13 +02:00
Regis Houssin
071c405bad Fix: error with php strict mode 2014-08-27 10:47:25 +02:00
Regis Houssin
0674667932 Fix: error with php strict mode 2014-08-27 10:46:42 +02:00
Regis Houssin
cdd716eb9d Fix: error with php strict mode 2014-08-27 10:44:40 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Alexis Algoud
40aadc8125 add extrafield in add form 2014-08-26 12:11:34 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Regis Houssin
9dafdf41bb Fix: error in strict mode 2014-08-26 09:51:00 +02:00
Regis Houssin
ca7ff0ecfa Fix: error in strict mode 2014-08-26 09:50:26 +02:00
Regis Houssin
28ad819ab4 Fix: error in strict mode 2014-08-26 09:49:15 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +02:00
Laurent Destailleur
e3fede595f Removed all triggers _BUILDOC. Building a document is not a business 
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	htdocs/core/modules/project/modules_project.php
	htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
 2014-08-22 00:01:53 +02:00
Laurent Destailleur
04b611f758 Merge pull request #1820 from aspangaro/develop-trad1 
Qual: Renamed table llx_c_civilite into llx_c_civility
 2014-08-21 23:25:49 +02:00
Laurent Destailleur
eb3c53d897 Merge pull request #1823 from Devensys/Develop-removeVersion 
Hidden version on login page
 2014-08-21 23:24:08 +02:00
Laurent Destailleur
cb3cb1f734 Merge pull request #1837 from GPCsolutions/civility_id 
Fix: module still using deprecated civilite_id
 2014-08-21 23:21:21 +02:00
Laurent Destailleur
061a3384fc Merge pull request #1836 from GPCsolutions/dictionaries 
Fix: module still using deprecated dictionnaries
 2014-08-21 23:21:08 +02:00
Raphaël Doursenaud
2c1e892efe Enhanced boxes model documentation 2014-08-21 18:35:34 +02:00
Laurent Destailleur
c799f0f10f Uniformize code: 
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
 2014-08-21 15:02:18 +02:00
Raphaël Doursenaud
c3b30893fc Enhanced modules parent class methods documentation 2014-08-21 12:17:13 +02:00
Raphaël Doursenaud
29ca4b7a0a Enhanced modules parent class properties documentation 2014-08-21 12:15:15 +02:00
aspangaro
2f4e1f09e6 Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment 2014-08-21 06:47:24 +02:00
Raphaël Doursenaud
9f02bc78a7 Fix: module still using deprecated civilite_id 2014-08-20 10:54:35 +02:00
Raphaël Doursenaud
820ae82088 Fix: module still using deprecated dictionnaries 2014-08-20 10:46:09 +02:00
aspangaro
0f7e09d01f Merge branch 'Upstream/develop' 2014-08-20 07:54:33 +02:00
Laurent Destailleur
a26a7cedf8 Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because 
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
 2014-08-19 14:51:10 +02:00
Laurent Destailleur
7437eb8088 New: On contact list can set filter on both active and not active (no 
more exclusive select).
 2014-08-19 14:40:20 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Regis Houssin
68aca6f2bb Fix: project builddoc trigger is used now 2014-08-18 08:40:35 +02:00
Regis Houssin
967991f31a Fix: project builddoc trigger is used now 2014-08-18 08:36:58 +02:00
Laurent Destailleur
be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php
 2014-08-17 19:34:12 +02:00
Laurent Destailleur
4f206a2125 Fix: Missing empty field 2014-08-17 19:27:25 +02:00
Laurent Destailleur
d5eb4510e2 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-17 17:59:30 +02:00
Laurent Destailleur
b58f6b36a8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-17 17:48:33 +02:00
Laurent Destailleur
45927cc986 Fix pb of links into state-region-country: 
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
 2014-08-17 17:47:25 +02:00
Laurent Destailleur
dd9a08120f Fix: no ' on command to create user on pgsql 2014-08-17 17:13:00 +02:00
Regis Houssin
e713c8dadc Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:20:43 +02:00
Regis Houssin
0632cbdad0 Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:15:52 +02:00
Regis Houssin
86f1d59e3c Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:12:20 +02:00
Laurent Destailleur
b0ebaec0da Fix: Add more log and missing error message 2014-08-17 12:43:24 +02:00
Laurent Destailleur
f392eb4c94 Merge pull request #1803 from defrance69/patch-15 
add company contact tabs
 2014-08-17 01:05:18 +02:00
Laurent Destailleur
8eac8c0c84 Avoid duplicate logs 2014-08-15 19:29:19 +02:00
Laurent Destailleur
7edf2eacea New: Each user can include its own external ics calendar into dolibarr 
agenda view.
 2014-08-15 17:08:05 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
Andrelec1
1ffb964dd1 Change method 
Replace by existing constant ..
 2014-08-14 16:06:43 +02:00
Laurent Destailleur
c17f5e7f00 Accept property fk_thirdparty instead of fk_soc 2014-08-14 16:04:42 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Laurent Destailleur
6b26ae6f1f Fix: Header of tables must use th and not td 2014-08-14 13:30:44 +02:00
Laurent Destailleur
b8b56e2d26 Fix: col balance 2014-08-14 13:25:54 +02:00
BENKE Charles
5d81eca1a3 change option name 
replace
MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES
by
MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES
 2014-08-14 10:47:28 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-14 00:59:48 +02:00
Laurent Destailleur
40349a9f53 Fix: Removed bad char 2014-08-14 00:55:27 +02:00
Laurent Destailleur
e424ae5b86 Merge pull request #1760 from FHenry/develop 
Remane contract ref_ext to ref_supplier
 2014-08-13 23:54:19 +02:00
Laurent Destailleur
3729178173 Merge pull request #1819 from FHenry/3.6 
Fix bug in output extrafields sell list
 2014-08-13 23:51:35 +02:00
Laurent Destailleur
e0a874b5fd Merge pull request #1808 from KreizIT/GETPost_review 
Add improvement to GETPOST function
 2014-08-13 23:44:58 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
454cb1cbf8 Enhance skeleton 
Add code_iso3 into array
 2014-08-13 19:19:36 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
Florian HENRY
3c96063165 fix travis 2014-08-12 18:38:27 +02:00
Florian HENRY
ca05345a60 Fix Travis 2014-08-12 18:20:36 +02:00
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
Andrelec1
8b6d613cb0 Hidde version on login page 
Create option and use it in login template
 2014-08-12 12:29:20 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
f7c31d651c Correct 2014-08-11 20:34:07 +02:00
aspangaro
e3ced8487a Correct 2014-08-11 20:33:13 +02:00
aspangaro
f2b9b8b1bb Correct 2014-08-11 20:06:10 +02:00
Laurent Destailleur
526066803c New: Function dol_delete_dir_recursive accept new param $onlysub 2014-08-11 15:20:07 +02:00
aspangaro
671f8e0be5 Correct 2014-08-11 14:03:30 +02:00
aspangaro
7d433f9845 Correct 2014-08-11 13:50:16 +02:00
aspangaro
6fd77e7ef6 Merge branch 'Upstream/develop' 2014-08-11 13:26:58 +02:00
Florian HENRY
aabbc331a4 Fix output extrafield selllist 2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5 Fix bug in output extrafields sell list 2014-08-11 13:09:35 +02:00
Laurent Destailleur
4ce2495a33 Fix: Parameter morefilter is missing. 2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86 New: Select list of users can return user into hierarchy. 2014-08-11 11:29:47 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
d801bcc690 Fix: When jmobile is forced, we force enable of javascript. 2014-08-08 14:37:51 +02:00
Laurent Destailleur
ebcc68cdfa Add commented code to use "clear" cookie. This help debug. 2014-08-08 13:09:06 +02:00
Laurent Destailleur
4922071af9 New: When a translation is not available we always jump to en_US and 
only en_US.
 2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1 Merge pull request #1807 from atm-maxime/develop 
New: Intervention documents are now available in ECM module
 2014-08-08 01:56:33 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Maxime Kohlhaas
3b14fa2b35 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-08-07 12:27:46 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
c64ffb3087 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-07 11:48:41 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:48:19 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
Laurent Destailleur
20cef1512f Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 21:34:47 +02:00
Laurent Destailleur
d694b10274 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-06 17:15:50 +02:00
KreizIT
180cc0b200 Add description for new param 2014-08-06 17:12:28 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
KreizIT
cfe35f32e8 - Add improvement to GETPOST function 
- Review thirdparty cards for illustration of new GETPOST functionality
 2014-08-06 15:59:36 +02:00
Maxime Kohlhaas
5e63f16d32 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2014-08-06 09:58:10 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2014-08-06 01:45:31 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
0397fa7dc3 Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:18:36 +02:00
Laurent Destailleur
2624632fde Fix: bad test commande_send -> order_send 2014-08-05 19:55:14 +02:00
Laurent Destailleur
e95a9cad03 New: When force of bcc is set, we show it onto email form. 2014-08-05 19:32:24 +02:00
Maxime Kohlhaas
1b3efbb9a3 New : add attachments on user cards 2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
4f47bddd0a New : Intervention documents are now available in ECM module (files downloadable) 2014-08-05 16:00:56 +02:00
Maxime Kohlhaas
90c397d1a4 New: Intervention documents are now available in ECM module 2014-08-05 15:24:49 +02:00
Laurent Destailleur
20d6920a0c Add comment 2014-08-05 09:27:40 +02:00
Laurent Destailleur
9436b1d046 New: Prepare to be able to defined a bcc for each type of email sent 
from dolibarr.
 2014-08-05 09:26:40 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
b8a0f6aec9 New: Add option to foce delivery receipt to yes 2014-08-04 19:03:15 +02:00
Laurent Destailleur
4e8ec8e598 Revert "Add Reduction value in pdf" 
This reverts commit 0b5707c1cf.
 2014-08-04 18:36:18 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard 
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
 2014-08-04 12:49:54 +02:00
Andrelec1
92a5030f8f replace with space by tab 2014-08-04 10:11:56 +02:00
Laurent Destailleur
c7d4b1e3d5 Merge pull request #1802 from FHenry/3.6 
Fix extrafield parameters for sellist
 2014-08-04 09:13:42 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5 
Fix : Fusion PDF button on unpaid invoice is no more displayed
 2014-08-04 09:08:47 +02:00
Laurent Destailleur
defb9a772f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 09:06:57 +02:00
Laurent Destailleur
7ac22cf7d2 Qual: no more currency into output, must be included into price function 2014-08-04 09:05:51 +02:00
Laurent Destailleur
8d867dde69 Merge pull request #1797 from Devensys/Develop-AddValueReduction 
Add Reduction value in pdf
 2014-08-04 09:01:45 +02:00
Laurent Destailleur
3024d82536 Merge pull request #1786 from atm-maxime/develop 
Fix on class not extending commonobject
 2014-08-04 08:58:54 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
86b2887d44 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-03 23:54:05 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Laurent Destailleur
1f2cc71975 New: Supervisor is now visible into user list. 2014-08-03 11:36:00 +02:00
Laurent Destailleur
9eab1f51cc Fix: remove debug output 2014-08-02 17:27:45 +02:00
BENKE Charles
250e8aacaf Update company.lib.php 2014-08-02 09:58:23 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Andrelec1
7318d0fbc0 Highliting IBAN (sepa) 
Highliting IBAN code in pdf ( SEPA )
 2014-08-01 15:13:21 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00