Commit Graph

141 Commits

Author SHA1 Message Date
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
4a3083a4c1 FIX Remove PHP Warning: Creating default object from empty value. 2016-05-16 19:34:24 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9
FIX if type fee not specified, line is invisible and can't edit it
2016-04-29 17:11:14 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11
FIX keep files attached with PROV status
2016-04-29 17:08:22 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +02:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01:00
Laurent Destailleur
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30:06 +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
aspangaro
7552fa20eb Fix: #4394 Untranslated label in list of expense reports 2016-01-11 21:18:12 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page
Fix Missing translations
2015-12-21 00:47:44 +01:00
Laurent Destailleur
fa277ef634 Fix duplicate translation 2015-12-20 20:11:29 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Raphaël Doursenaud
5aaafc3f8a [Qual] OOP constructor
Using class name as constructor method is deprecated in PHP 7
2015-12-10 16:37:37 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
d4268c079f Fix syntax error 2015-12-06 12:23:49 +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
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
philippe grand
f640486c8b [Qual] Uniformize code 2015-12-04 22:50:03 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Frédéric FRANCE
6d7e360498 Update list.php 2015-11-28 20:33:18 +01:00
Laurent Destailleur
3485e351a4 Fix do not jump to top of page when clicking on "Link to order" 2015-11-28 15:46:20 +01:00
Laurent Destailleur
826c4de26b Uniformize and debug module expense report. 2015-11-28 15:28:59 +01:00
Laurent Destailleur
295eb533f8 FIX Bad picto for expense report 2015-10-25 20:16:40 +01:00
Laurent Destailleur
54883f2d84 FIX Bad picto for expense report 2015-10-25 20:14:57 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
b748c4e328 Uniformize code 2015-10-17 02:03:59 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +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
aspangaro
425e7ce808 Fix : ER Show date in english format 2015-10-07 22:31:23 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Laurent Destailleur
e444cb57d4 Fix bad print 2015-10-03 00:35:26 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00