Commit Graph

1673 Commits

Author SHA1 Message Date
Laurent Léonard
a337b6f874 Rename "duree" property of interventions to "duration"
This also fixes the display problem of total duration on the "soleil" document model
2015-06-11 23:18:29 +02:00
Regis Houssin
edd5c33c5b Fix: Strict standards: Only variables should be passed by reference
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
2015-06-10 18:22:47 +02:00
aspangaro
592d124f26 Merge remote-tracking branch 'Upstream/develop' into develop-28 2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples
Fix #2988
2015-06-08 17:13:23 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation
Fix: Donation error on admin tab & Fix: Input disabled by default
2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22
Fix: wrong file & problem to install model
2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
Laurent Destailleur
4adeb8980d NEW Add ref and label of project into export 2015-06-03 16:40:02 +02:00
aspangaro
bde91633da Fix: input of french article is disabled by default 2015-06-03 06:01:05 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
Laurent Destailleur
7f352e5b24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12 Use dedicated picto 2015-05-30 15:21:48 +02:00
Laurent Destailleur
03c06b3cf8 Merge pull request #2916 from aspangaro/develop-patch23
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Regis Houssin
c8c0f0f038 Fix: possibility to shared facnumber between entities 2015-05-29 11:31:51 +02:00
aspangaro
d3513bf2a7 Fix: lot of typo to export salaries 2015-05-28 06:41:01 +02:00
aspangaro
58893a4576 Fix: problem of rights to export salaries 2015-05-28 06:26:28 +02:00
abb
ba68598ec7 added new trigger for supplier invoice unvalidation in Agenda 2015-05-23 15:09:44 +01:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Florian HENRY
f29d8aed5b Fix problem with multicompany on new feature Product propal merge PDF
product
2015-05-15 17:39:28 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
aspangaro
766c58724a ER: Review & add a totalVAT in pdf 2015-05-14 08:26:41 +02:00
aspangaro
bba0349ab6 ER: traduce code 2015-05-14 07:36:48 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Juanjo Menent
23bd8f50df Merge pull request #2809 from atm-maxime/develop
New : Signature area on proposal PDF
2015-05-11 20:09:54 +02:00
Laurent Destailleur
f275145bd2 FIX We did a test on a permission to export contract when permission did
not exists.
2015-05-10 23:46:34 +02:00
Laurent Destailleur
a503d90982 FIX We did a test on a permission to export contract when permission did
not exists.
2015-05-10 23:37:04 +02:00
Maxime Kohlhaas
443badfbcf New : Signature area on proposal PDF 2015-05-10 17:39:57 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Laurent Destailleur
36ebaf7a22 Clean code 2015-05-06 23:31:03 +02:00
Maxime Kohlhaas
1cb7d284a5 Fix : shipment PDF was not using generation params
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b Fix : shipment PDF was not using generation params
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00