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

42410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1e28653aa9 Merge pull request #1720 from KreizIT/develop 
Fix rollback and test errno
 2014-07-07 21:23:32 +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
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
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
Laurent Destailleur
389554bd9d Merge branch 'marcosgdf-db-relations' into develop 2014-07-04 14:06:26 +02:00
Laurent Destailleur
f9ee4b3c9d Merge branch 'db-relations' of github.com:marcosgdf/dolibarr into 
marcosgdf-db-relations

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-04 14:06:07 +02:00
Laurent Destailleur
62832167a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 13:45:07 +02:00
Laurent Destailleur
a636c58cef Merge branch 'marcosgdf-syslog' into develop 2014-07-04 13:44:31 +02:00
Juanjo Menent
fdb938af0f [ task #1063 ] Allow edit localtaxes rate for thirds. Remove country 
condition
 2014-07-04 13:44:26 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Juanjo Menent
466086dca3 [ task #1063 ] Allow edit localtaxes rate for thirds. Remove country 
condition
 2014-07-04 13:37:25 +02:00
Laurent Destailleur
fa84409fea Merge pull request #1707 from FHenry/3.6 
avoid warning message on preg_replace
 2014-07-04 13:22:36 +02:00
Laurent Destailleur
9fa44e6221 Merge pull request #1706 from frederic34/patch-2 
Update 3.6.0-3.7.0.sql
 2014-07-04 13:21:57 +02:00
Laurent Destailleur
9631dc908b Merge pull request #1705 from frederic34/patch-1 
Update .travis.yml
 2014-07-04 13:20:55 +02:00
Laurent Destailleur
8c306a968f Merge pull request #1704 from KreizIT/review_trig 
Review user trigger
 2014-07-04 13:20:32 +02:00
Florian HENRY
cdfe8818da avoid message 
Delimiter must not be alphanumeric or backslash in
/home/bobby/Eclipse/workspace/dolibarr/htdocs/main.inc.php on line 450
on preg_replace
 2014-07-04 13:16:48 +02:00
Juanjo Menent
3679a4ba90 [ task #1063 ] Allow edit localtaxes rate for thirds. Works documents 
pdf
 2014-07-04 13:11:51 +02:00
Laurent Destailleur
7d519fdfe6 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-04 13:08:50 +02:00
Laurent Destailleur
105e7189ec Add -p on phpcs to avoid timeout 2014-07-04 13:08:31 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Juanjo Menent
747b6a9f94 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports 
and payments
 2014-07-04 12:50:55 +02:00