Commit Graph

47328 Commits

Author SHA1 Message Date
Laurent Destailleur
6f96d4cd5c Minimum style 2015-03-04 02:18:20 +01:00
Laurent Destailleur
2c3a412c3a Fix export extrafield on supplier orders 2015-03-04 02:08:51 +01:00
Laurent Destailleur
52425648bf NEW: When using transfer or correct stock from warehouse, after
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +01:00
Laurent Destailleur
fddbca50b1 Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
tracking id into email.
2015-03-03 18:33:53 +01:00
Florian HENRY
ae8ca9e96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-03 17:55:57 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
BENKE Charles
06b7f610ed Update index.php
list of cossumed time more usefull if ordered by desc
2015-03-03 17:18:20 +01:00
guillaume
5a5a2f1bcf Affichage de la liste des tables dans les infos de base de données. 2015-03-03 15:54:55 +01:00
guillaume
1b89b8c808 Ajout de la liste des paramètres en utilisant l'instruction PRAGMA 2015-03-03 15:22:52 +01:00
guillaume
e4edafd42a Ajout de la liste des paramètres en utilisant l'instruction PRAGMA 2015-03-03 15:21:14 +01:00
Laurent Destailleur
e667c3e916 Fix error management 2015-03-03 13:29:16 +01:00
guillaume
8de170bfc2 Ajout de fonctions pour le traitement des dates avec SQLITE. 2015-03-03 13:06:20 +01:00
aspangaro
022d051726 Typo 2015-03-03 06:32:46 +01:00
aspangaro
42e43791ef Add ajax for type on edit mode 2015-03-03 06:20:09 +01:00
aspangaro
fafebf5b2a NEW: [T1758] Merge bank card & account card 2015-03-02 22:44:11 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-02 21:05:38 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar
was set.
2015-03-02 17:34:50 +01:00
Marcos García de La Fuente
77605bce3e [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment 2015-03-02 13:33:31 +01:00
Florian HENRY
d80a8bbdba revert bug1840 to eldy solution 2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
Conflicts:
	htdocs/contrat/card.php
2015-03-02 10:02:54 +01:00
Laurent Destailleur
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
48356005c3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-02 03:00:29 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
1493e66d64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 02:39:29 +01:00
Laurent Destailleur
45a90b54fe Fix: param to set id of object into url must be id everywhere (except
company, it might be socid)
2015-03-02 02:14:18 +01:00
Laurent Destailleur
c0d0fa317b Merge pull request #2404 from frederic34/patch-3
Update card.php
2015-03-02 02:05:40 +01:00
Laurent Destailleur
5a541c4206 Forgot to commit one file 2015-03-02 01:39:08 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Marcos García de La Fuente
7876238823 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Marcos García de La Fuente
e6c8cac381 Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit 2015-03-02 01:16:35 +01:00
Marcos García de La Fuente
eb99202dc2 Little changes 2015-03-02 01:10:31 +01:00
Laurent Destailleur
ba98f6f94a Fix: Bad management of error 2015-03-02 01:05:12 +01:00
Laurent Destailleur
495d066cfc Merge pull request #2378 from aspangaro/develop-patch6
Update TCPDF library to 6.2.6
2015-03-02 00:45:50 +01:00
Laurent Destailleur
9b2a90b468 Fix: all home area pages has the search box first. 2015-03-02 00:43:17 +01:00
Laurent Destailleur
2dcbb6ada5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 00:41:57 +01:00
Laurent Destailleur
ef89ff6601 Merge pull request #2402 from aspangaro/develop-patch14
NEW: Add a search field and report on hrm area
2015-03-02 00:41:43 +01:00
Laurent Destailleur
0774669331 Update comment 2015-03-02 00:37:47 +01:00
Laurent Destailleur
f81cb81e67 Merge pull request #2405 from frederic34/patch-5
phpcs
2015-03-02 00:31:50 +01:00
Laurent Destailleur
ce8cbee5d2 Merge pull request #2399 from marcosgdf/misc
misc
2015-03-02 00:31:27 +01:00
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice
Better practice in getBrowserInfo
2015-03-02 00:28:40 +01:00
Laurent Destailleur
6d3381bfa0 Merge pull request #2398 from marcosgdf/deprecated
Marked getStaticMember as deprecated
2015-03-02 00:23:36 +01:00
Laurent Destailleur
7fc0c2b485 Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements
New add doc on project linked elements
2015-03-02 00:19:21 +01:00
aspangaro
e24a317f0f NEW: Add bank account owner in invoice/proposal/orders footer 2015-03-01 21:31:03 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e Fix: we must use status to find label of status 2015-03-01 16:24:02 +01:00