Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
45,669 Commits 36 Branches 189 Tags
1a2bde14fb2fad0fab128f25a172579c8667cb15
Commit Graph

212 Commits

Author SHA1 Message Date
Laurent Destailleur
b7a466c95f Fix bad style for total 2015-03-23 13:50:14 +01:00
Marcos García de La Fuente
034455fc2d Fix: [ bug #1722 ] Missing link in homepage project's box 2014-12-23 16:37:53 +01:00
Laurent Destailleur
ae6f458a98 Merge pull request #2092 from frederic34/patch-2 
Fix Typo
 2014-11-28 00:12:11 +01:00
Laurent Destailleur
02d53aa26f Merge pull request #2093 from frederic34/patch-4 
Fix Typo
 2014-11-28 00:11:49 +01:00
Laurent Destailleur
b21171303a Merge pull request #2094 from frederic34/patch-5 
Fix Typo
 2014-11-28 00:11:23 +01:00
Laurent Destailleur
631a98c322 Merge pull request #2095 from frederic34/patch-6 
Fix Typo
 2014-11-28 00:10:48 +01:00
Laurent Destailleur
61889d2195 Merge pull request #2096 from frederic34/patch-7 
Fix Typo
 2014-11-28 00:10:24 +01:00
Frédéric FRANCE
90b582b1f3 Fix 1733 Homepage boxes close button translation error 
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
 2014-11-26 16:58:54 +01:00
Frédéric FRANCE
911f9c0913 Fix Typo 2014-11-25 01:13:52 +01:00
Frédéric FRANCE
e4517ee0f4 Fix Typo 2014-11-25 01:07:45 +01:00
Frédéric FRANCE
9fb58e06f6 Fix Typo 2014-11-25 01:06:55 +01:00
Frédéric FRANCE
6163635d7c Fix Typo 2014-11-25 01:06:04 +01:00
Frédéric FRANCE
9d813b25d9 Fix Typo 2014-11-25 01:05:01 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
2b8abf2794 Fix: Missing label 2014-11-02 20:07:38 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
30e27014b8 Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:14 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
013023204f Merge pull request #1841 from GPCsolutions/modules 
Modules classes documentation enhancements
 2014-08-28 11:58:13 +02:00
Raphaël Doursenaud
2c1e892efe Enhanced boxes model documentation 2014-08-21 18:35:34 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Laurent Destailleur
b8b56e2d26 Fix: col balance 2014-08-14 13:25:54 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
202774de0b Merge pull request #1791 from frederic34/patch-graphbox 
External user must not have graph box with all stats
 2014-07-31 17:51:31 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
frederic34
50e3049fd7 External user must not have graph box with all stats 2014-07-30 17:10:08 +02:00
Marcos García de La Fuente
1c97b3f779 Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode 2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
Laurent Destailleur
0f9aa69e4e Fix: New: Differentiate text and img for better accessibility. 2014-07-29 21:34:23 +02:00
Laurent Destailleur
b57371bfa1 Fix: New: Differentiate text and img for better accessibility. 2014-07-29 20:21:01 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin 
person is on, box addon was broken.
 2014-07-29 00:50:57 +02:00
frederic34
a771f34c96 Update box_activity.php 
$totalnb is not an amount
 2014-07-27 11:27:33 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
BENKE Charles
bbe400e01f Update box_actions.php 
Add popup action feature on homepage
 2014-07-11 14:21:36 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
BENKE Charles
b34947b37c fix travis error 2014-06-21 00:08:13 +02:00
BENKE Charles
496379ced8 fix travis error 2014-06-20 23:56:03 +02:00
BENKE Charles
24e780cb0c Update box_task.php 2014-06-20 23:39:43 +02:00
BENKE Charles
a31d5cc193 Update box_project.php 2014-06-20 23:38:15 +02:00
BENKE Charles
8070030c45 Update box_project.php 2014-06-20 23:19:57 +02:00
BENKE Charles
ec1a6e1c29 Update box_task.php 2014-06-20 23:17:26 +02:00