Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,244 Commits 37 Branches 191 Tags
7d72b6c3a1d5eeb8185365524344a4b51128fe69
Commit Graph

2464 Commits

Author SHA1 Message Date
Laurent Destailleur
7d72b6c3a1 Add comments 2014-06-28 14:06:29 +02:00
Laurent Destailleur
29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into 
defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
 2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1 Using hidden constant to use the feature 
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
 2014-06-26 22:34:40 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a Merge pull request #1686 from KreizIT/movetrig 
Fix [ bug #1459 ]
 2014-06-26 21:01:48 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
KreizIT
92f1778c9d Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error 
Start refactoring trigger call from within object
 2014-06-25 16:51:26 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
a72c3d4381 Merge branch 'develop' of github.com:atm-maxime/dolibarr into 
atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2014-06-20 17:11:12 +02:00
Laurent Destailleur
2dc3e5b104 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger (Add a protection to avoid multiple errors).
 2014-06-20 16:20:39 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Maxime Kohlhaas
dd83a52fb1 Fix : project list was showing all projects instead of company project. This wasn't matching the function comments. 2014-06-20 13:59:50 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Laurent Destailleur
48cdd3c13f Fix: extra fields key. 2014-06-06 16:08:42 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
c45aace9b9 Add easy fix to solve pb of links for some modules. 2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63 Fix: Missing global 2014-06-05 22:42:49 +02:00
Florian HENRY
0de66e838c camel case 2014-05-30 12:01:26 +02:00
Laurent Destailleur
fb0f0047e7 Merge pull request #1633 from aspangaro/develop 
Typo / Missing key language / Fix limit list on mass movement stock page
 2014-05-30 11:33:08 +02:00
Laurent Destailleur
82a2a723c3 Fix: [ bug #1419 ] Margins module shows margin of sold services even if 
services module is disabled
 2014-05-29 21:01:00 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form 
Fix: pgsql driver
 2014-05-29 19:56:15 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Florian HENRY
f87772f3ec Add comment for travis 2014-05-29 14:56:55 +02:00
Florian HENRY
d15c3b2c23 CRLF 2014-05-29 14:30:09 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +02:00
aspangaro
e856e64bc9 Typo 2014-05-28 06:17:09 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep 
only user.
 2014-05-26 17:21:48 +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
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
BENKE Charles
3d7b6e9a26 Update commonobject.class.php 2014-05-24 19:51:05 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
BENKE Charles
c8067931e3 Update commonobject.class.php 2014-05-19 09:32:42 +02:00
BENKE Charles
b210d7a00f Update commonobject.class.php 
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
 2014-05-18 14:59:20 +02:00