lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,433 Commits 43 Branches 150 Tags 886 MiB
aaa2d75dc3
Commit Graph

42433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
aaa2d75dc3 Disable test on Zend.Files.ClosingTag for the moment to try to restore a 
green status with travis.
 2014-07-08 01:04:16 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
3c81c99656 Fix: Try to solve pb of timeout with travis. 2014-07-08 00:29:25 +02:00
Laurent Destailleur
07ff74b069 Revert "Update ruleset.xml" 
This reverts commit 9cca9f352f.
 2014-07-08 00:19:00 +02:00
Laurent Destailleur
8c1abac3de Merge pull request #1712 from frederic34/patch-3 
Update .travis.yml
 2014-07-07 21:29:14 +02:00
Laurent Destailleur
688d58413b Merge pull request #1710 from aspangaro/develop-accounting2 
New feature :: Add fiscal year
 2014-07-07 21:28:35 +02:00
Laurent Destailleur
a2bc97210b Merge pull request #1721 from frederic34/patch-6 
Update ruleset.xml
 2014-07-07 21:27:09 +02:00
Laurent Destailleur
8b9755e7c2 Merge pull request #1717 from frederic34/patch-5 
Update ruleset.xml
 2014-07-07 21:24:17 +02:00
Laurent Destailleur
9eaa096c79 Merge pull request #1716 from frederic34/patch-4 
Update ruleset.xml
 2014-07-07 21:24:00 +02:00
Laurent Destailleur
1e28653aa9 Merge pull request #1720 from KreizIT/develop 
Fix rollback and test errno
 2014-07-07 21:23:32 +02:00
frederic34
9cca9f352f Update ruleset.xml 
PHP code MUST NOT contain any character before the opening tag
 2014-07-07 21:11:03 +02:00
KreizIT
4e08e2b5d5 Fix rollback and test errno 2014-07-07 11:32:56 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
f43dd6c834 Fix: form is not allowed inside a table 2014-07-06 21:12:16 +02:00
Laurent Destailleur
4dbc1dd1c6 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-06 21:09:10 +02:00
Laurent Destailleur
8ed0798939 Use id of module + delta 2014-07-06 20:53:38 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
frederic34
f7586cdbfa Update ruleset.xml 
PHP code MUST use only UTF-8 without BOM.
 2014-07-06 16:43:16 +02:00
frederic34
2080f58c2c Update ruleset.xml 
The closing ?> tag MUST be omitted from files containing only PHP.
 2014-07-06 15:49:24 +02:00
aspangaro
e294fe1edd Update 2014-07-05 21:58:39 +02:00
aspangaro
7892852f44 Merge branch 'Upstream/develop' 2014-07-05 21:56:47 +02:00
frederic34
1aa719272b Update .travis.yml 
Just check php files
 2014-07-05 14:56:45 +02:00
Laurent Destailleur
851fdf3bb7 Merge pull request #1711 from FHenry/3.6_contractextrafields 
3.6 contractextrafields
 2014-07-05 12:53:14 +02:00
Laurent Destailleur
823e976f39 Change the way parameters are provides to scripts 
sync_xxx_ldap2dolibarr.php
 2014-07-05 12:27:35 +02:00
Laurent Destailleur
e5d5a25433 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2014-07-05 11:54:02 +02:00
Laurent Destailleur
2921412634 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-05 11:51:02 +02:00
Laurent Destailleur
dec4ff2e19 Fix: Duplicate confirmation 2014-07-05 11:50:25 +02:00
Laurent Destailleur
fe547de0e3 Fix: Removed duplicate lines 2014-07-05 11:32:44 +02:00
Florian HENRY
fe50d8b1ab restore min jquery 2014-07-05 11:19:49 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Florian HENRY
13c208dd8f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-05 10:28:58 +02:00
Laurent Destailleur
fa82cbceb9 Qual: Removed useless function 2014-07-05 08:59:41 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
b4bffb902f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-05 06:09:25 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
Juanjo Menent
9aa234255d [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 18:26:56 +02:00
Laurent Destailleur
baea822ed5 Fix: Migration script 2014-07-04 18:24:48 +02:00
Juanjo Menent
74b42f6cb4 [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:31:34 +02:00
Juanjo Menent
65d303999f [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:26:21 +02:00
Juanjo Menent
2ca01741ac [ task #1063 ] Allow edit localtaxes rate for thirds. Language 2014-07-04 17:17:35 +02:00
Juanjo Menent
8e4e08f907 [ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu 2014-07-04 16:48:42 +02:00
Juanjo Menent
4063260cc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 16:16:52 +02:00
Laurent Destailleur
42f33fc10e New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos 
shown on main product card.
 2014-07-04 15:14:14 +02:00
Laurent Destailleur
ad15f3f1e9 New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos 
shown on main product card.
 2014-07-04 15:13:02 +02:00
Laurent Destailleur
6144f90770 New: Form to add a photo is immediatly available on photo page if 
permissions are ok (save one click per photo to add).
 2014-07-04 15:06:45 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00
Laurent Destailleur
3ea52a7967 Reduce memory print of object thirdparty. 2014-07-04 14:25:08 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00