Commit Graph

113 Commits

Author SHA1 Message Date
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Juanjo Menent
b8efe3b239 Merge pull request #9172 from grandoc/new_branch_28_07_2018
standardize
2018-08-02 11:27:02 +02:00
Philippe GRAND
d673848028 standardize 2018-07-30 17:28:44 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
4d5c28b597 loadlangs 2018-05-27 09:27:09 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
florian HENRY
a34709c112 fix better thirdparty link 2018-03-09 22:36:00 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e Remove spaces 2017-12-28 09:48:41 +01:00
Laurent Destailleur
3ac413084f Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
ATM-Nicolas
bdf1e30ef3 Merge branch 'develop' into 6.0_fix_project_conf 2017-12-05 12:20:48 +01:00
Laurent Destailleur
38be224665 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-02 14:14:26 +01:00
Laurent Destailleur
5fae19b4d6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-02 14:13:29 +01:00
Laurent Destailleur
c7d0e917fb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-12-02 14:12:43 +01:00
Frédéric FRANCE
01a3787664 swap llxfooter() and $db->close() 2017-10-31 13:45:13 +01:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
d3c95e030b Fix delete file not possible for external user even with permissions 2017-08-30 14:34:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
2dcb97e61d Continue work on dol_banner 2016-12-11 13:16:21 +01:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
aspangaro
3892f295c7 Uniformize presentation of customer's invoice 2016-08-31 06:27:35 +02:00
aspangaro
3cdb2d45c2 Uniformize presentation customer invoice 2016-08-01 07:10:42 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31 factorized document actions
Conflicts:
	htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
97474bf77f Fix: strict mode safari 2012-08-16 19:18:24 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of
message
2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links
Created BackToList links
2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00