Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,690 Commits 36 Branches 190 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

237 Commits

Author SHA1 Message Date
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
BENKE Charles
754b028ec6 Update box_project.php 2014-06-18 22:19:28 +02:00
BENKE Charles
31c2815d0f Update box_task.php 2014-06-18 21:50:17 +02:00
BENKE Charles
c963a6d8a1 Create box_project.php 
add box for project
 2014-06-18 21:36:00 +02:00
BENKE Charles
ff31fff2d7 Create box_task.php 
add boxes of tasks
 2014-06-18 21:34:18 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
5f1e690039 New: Show invoice ref in boxes for supplier invoices. 2014-04-26 23:15:45 +02:00
BENKE Charles
a3a6b6dff6 Update box_ficheinter.php 
External user show only is own intervention
 2014-03-26 10:57:07 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
c9b1c562cc Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2014-02-05 21:03:05 +01:00
Laurent Destailleur
e3ac9db9ec Fix: Data was encode twice making bad translation for language with 
special chars.
 2014-02-05 12:11:39 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes: 
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
 2014-01-31 18:48:57 +01:00
Laurent Destailleur
f50ad96beb Fix: var init at wrong place 2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
Laurent Destailleur
b5620d5f15 New: The box "balance of bank accounts" show all opened accounts. 2014-01-15 17:52:16 +01:00
Laurent Destailleur
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00