Laurent Destailleur
|
840b047468
|
Work on new timesheet input pages.
|
2015-03-18 11:20:08 +01:00 |
|
Laurent Destailleur
|
5d4d8151c1
|
Work on new timesheet input pages.
|
2015-03-18 11:04:50 +01:00 |
|
Laurent Destailleur
|
c700d8a8ec
|
Fix remove warning
|
2015-03-17 11:59:44 +01:00 |
|
Laurent Destailleur
|
166fda4909
|
Normalize class names
|
2015-03-17 11:26:23 +01:00 |
|
Laurent Destailleur
|
6e251690ab
|
Doxygen
|
2015-03-17 11:23:45 +01:00 |
|
Laurent Destailleur
|
84bea6166e
|
Doxygen
|
2015-03-17 10:55:45 +01:00 |
|
Laurent Destailleur
|
4fffeb3a89
|
Clean code
|
2015-03-17 10:52:27 +01:00 |
|
Laurent Destailleur
|
689d270552
|
Doxygen
|
2015-03-17 10:47:20 +01:00 |
|
Laurent Destailleur
|
bfd979224f
|
Var not declared
|
2015-03-17 10:38:25 +01:00 |
|
Laurent Destailleur
|
a73ff524e5
|
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2015-03-17 00:38:40 +01:00 |
|
Scrutinizer Auto-Fixer
|
b693ed3f51
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-16 23:21:17 +00:00 |
|
Laurent Destailleur
|
141fa56d67
|
Fixed bad parameter
|
2015-03-17 00:11:04 +01:00 |
|
Laurent Destailleur
|
6d7b340cee
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
|
2015-03-16 18:30:30 +01:00 |
|
aspangaro
|
03bf12bdc0
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-16 06:32:11 +01:00 |
|
aspangaro
|
1cd81f0e81
|
Work on module donations
|
2015-03-16 06:29:15 +01:00 |
|
Laurent Destailleur
|
daf853d040
|
Merge pull request #2455 from aspangaro/develop-ReviewER
QUAL: Traduce terms + remove <center>
|
2015-03-16 02:11:29 +01:00 |
|
AcceTT Soluciones Computacionales
|
60d334f646
|
Update functionsnumtoword.lib.php
Now the function convert since -1000000000000 to 1000000000000.
Correct some bugs.
Change $lang-> default to $langs
|
2015-03-15 17:47:51 -06:00 |
|
Marcos García de La Fuente
|
6ba3b900b7
|
PHPCS Fix
|
2015-03-15 23:42:11 +01:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
efb9f7f4fd
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
|
2015-03-15 18:07:30 +01:00 |
|
Marcos García de La Fuente
|
2e68b51a10
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-03-15 17:52:07 +01:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Marcos García de La Fuente
|
094538c07b
|
Implemented constants in Commande, Facture and Propal
|
2015-03-15 11:48:57 +01:00 |
|
BENKE Charles
|
8f0e514f83
|
Update pdf_paiement.class.php
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
|
2015-03-15 10:49:16 +01:00 |
|
Ion Agorria
|
2c80b39937
|
Configuration page of dinamic prices and price global variables editor
|
2015-03-14 16:51:38 +01:00 |
|
Ion Agorria
|
5f9b1fa029
|
Changes for applying new paths
|
2015-03-14 16:50:02 +01:00 |
|
Laurent Destailleur
|
10bbf463e7
|
Several bug fixes from scrutinizer
|
2015-03-14 14:55:41 +01:00 |
|
Laurent Destailleur
|
c4ff66c5d7
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-03-14 13:46:18 +01:00 |
|
Laurent Destailleur
|
89b22be063
|
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
|
2015-03-14 13:44:26 +01:00 |
|
Laurent Destailleur
|
ca34575df4
|
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
|
2015-03-14 13:42:00 +01:00 |
|
BENKE Charles
|
9e62013bca
|
Update admin_extrafields_edit.tpl.php
add new type of extrafields : link
|
2015-03-14 12:44:26 +01:00 |
|
BENKE Charles
|
4783db82ac
|
Update admin_extrafields_add.tpl.php
new type of extrafield : link
|
2015-03-14 12:42:52 +01:00 |
|
Laurent Destailleur
|
5670e92842
|
Position of field into pdf baleine
|
2015-03-14 12:35:03 +01:00 |
|
BENKE Charles
|
0aa2360691
|
Update extrafields.class.php
add new extrafields type 'link'
|
2015-03-14 12:31:22 +01:00 |
|
BENKE Charles
|
df9f822a70
|
Update commonobject.class.php
new extafields type
|
2015-03-14 12:25:17 +01:00 |
|
BENKE Charles
|
41a05bc4ba
|
Update actions_extrafields.inc.php
add new type of extrafields "link" : linked to dolibarr element
|
2015-03-14 12:04:00 +01:00 |
|
Laurent Destailleur
|
d056abc4e1
|
No need to have this protected. Property can be read with method show()
and this method can be override.
|
2015-03-13 21:45:52 +01:00 |
|
Laurent Destailleur
|
ba2c0a2651
|
Clean code of hooks.
Extrafield index on fk_object must be unique.
|
2015-03-13 20:27:54 +01:00 |
|
Laurent Destailleur
|
bc3f9bf800
|
Fix: the visible version was not enough to know version of dolibarr. We
also need the MAIN_FEATURES_LEVEL.
|
2015-03-13 18:11:31 +01:00 |
|
Laurent Destailleur
|
687e3d250b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
dev/fixdosfiles.sh
htdocs/core/tpl/objectline_edit.tpl.php
|
2015-03-13 17:46:31 +01:00 |
|
Laurent Destailleur
|
a452823e1e
|
Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
with 3.6
|
2015-03-13 15:20:08 +01:00 |
|
Laurent Destailleur
|
895b2c6e9c
|
Fix bad merge
|
2015-03-13 14:37:27 +01:00 |
|
Maxime Kohlhaas
|
60022ab80d
|
NEW : autofocus on product selection dropdown list or search field
|
2015-03-12 17:25:57 +01:00 |
|
Laurent Destailleur
|
e8e2f65ae5
|
Debug virtual product interface
|
2015-03-11 14:55:45 +01:00 |
|
Laurent Destailleur
|
958667ada0
|
Fix phpcs
|
2015-03-11 12:33:34 +01:00 |
|
aspangaro
|
3897e65425
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-11 05:28:59 +01:00 |
|
Laurent Destailleur
|
e2e95b5f8c
|
phpcs
|
2015-03-11 03:58:57 +01:00 |
|
Laurent Destailleur
|
a5645b626c
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
|
2015-03-11 03:55:46 +01:00 |
|
Laurent Destailleur
|
c1432eb2da
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
|
2015-03-11 03:29:52 +01:00 |
|
Laurent Destailleur
|
ec322e2e29
|
Revert was not complete
|
2015-03-11 03:03:17 +01:00 |
|