Commit Graph

43424 Commits

Author SHA1 Message Date
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
Laurent Destailleur
a3bbf2aff9 Fix: Correct height of empty line for thirdparties combo list. 2014-09-08 12:05:24 +02:00
Laurent Destailleur
562c47dd62 Fix: colspan too low. 2014-09-08 12:00:25 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
b63cfccf49 On peruser agenda view, use different color if event is busy or not for
user.
2014-09-08 10:24:16 +02:00
Laurent Destailleur
9720ab1ea5 Fix: Not a required field 2014-09-07 20:22:02 +02:00
Laurent Destailleur
2c46613f4a New: View per user into agenda. 2014-09-07 19:56:17 +02:00
Laurent Destailleur
0cefe5af43 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/date.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/includes/tcpdf/include/tcpdf_static.php
	htdocs/product/price.php
2014-09-07 13:18:56 +02:00
Laurent Destailleur
97c9d6bafc Fix dos files 2014-09-07 12:28:58 +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
Laurent Destailleur
9d2d165cfc Fix: debian key dfsg and not dsfg 2014-09-07 11:21:04 +02:00
Laurent Destailleur
5a93a7620c Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence. 2014-09-07 11:00:54 +02:00
Laurent Destailleur
012643a892 New: Can filter on status on interventions. 2014-09-06 19:10:59 +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
bc7d839c64 Fix: Missing status "refunded".
Fix: translation
2014-09-06 17:16:24 +02:00
Laurent Destailleur
996977a4a8 Fix: Missing user name 2014-09-06 17:10:52 +02:00
Laurent Destailleur
91a894f459 Fix: Missing user name 2014-09-06 17:10:22 +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
Laurent Destailleur
cbaa7816bf New: add css style "cursorpointer".
Start to work on clicable links into peruser agenda view.
2014-09-06 00:32:54 +02:00
Laurent Destailleur
31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php
2014-09-06 00:26:11 +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
70494bab95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-05 23:10:57 +02:00
aspangaro
b543f76ac9 Changelog
Conflicts:
	ChangeLog
2014-09-05 22:38:17 +02:00
Juanjo Menent
104df1d16d Merge pull request #1866 from aspangaro/3.6
Payment VAT & Salaries :: Add controls on field required
2014-09-05 22:30:03 +02:00
Laurent Destailleur
be0f091474 css for agenda view per user 2014-09-05 21:47:16 +02:00
Laurent Destailleur
7bbeca147b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-05 21:12:22 +02:00
Laurent Destailleur
a86de9b685 Work on agenda per user. 2014-09-05 21:12:01 +02:00
aspangaro
f054d624cd Merge branch 'Upstream/3.6' 2014-09-05 20:59:44 +02:00
aspangaro
71832b5944 Changelog 2014-09-05 20:55:40 +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
6c7d2cdd12 Merge pull request #1868 from aspangaro/develop-patch3
Bank card presentation on edit & create
2014-09-05 09:41:15 +02:00
Juanjo Menent
04c2c4379a Merge pull request #1855 from grandoc/develop
add product minimum recommended price
2014-09-05 09:34:58 +02:00
Laurent Destailleur
531a48388b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-05 09:33:30 +02:00
Laurent Destailleur
a93ad958ac New: Add help info of field type into dictionary of payment types. 2014-09-05 09:33:12 +02:00
Juanjo Menent
ffc730d82f Merge pull request #1867 from aspangaro/develop-patch1
Payment VAT & Salaries :: Add controls on field required
2014-09-05 09:08:28 +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
e4bff59f1a Fix: pgsql compatibility. No upper cas into field names. 2014-09-04 20:17:25 +02:00
Laurent Destailleur
a57e0d3505 Fix: Do not use &nbsp as value of a list 2014-09-04 19:27:59 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
2014-09-04 19:03:48 +02:00
Laurent Destailleur
cd00ec29bf Fix: Dictionnary with one n
Conflicts:
	htdocs/expedition/fiche.php
2014-09-04 19:00:28 +02:00
Laurent Destailleur
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Laurent Destailleur
a9fb86e506 Fix: Dictionnary with one n 2014-09-04 18:41:28 +02:00