lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,374 Commits 43 Branches 150 Tags 886 MiB
27fede8848
Commit Graph

39374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
9b36df85dd Fix: invert parameters 2013-09-28 13:22:28 +02:00
BENKE Charles
f52e9812fa Update societe.class.php 2013-09-27 22:12:12 +02:00
BENKE Charles
ca0ba99eff Update facture.php 2013-09-27 22:08:06 +02:00
BENKE Charles
fff1309cec Update facture.php 2013-09-27 22:06:05 +02:00
BENKE Charles
4c168b3adb Update propal.php 2013-09-27 22:00:11 +02:00
BENKE Charles
9e3a98da0d Update fiche.php 2013-09-27 21:58:15 +02:00
Laurent Destailleur
7ac7034494 Merge pull request #1247 from altairis-fr/3.4 
fix bug on filter and sort
 2013-09-27 09:01:17 -07:00
Laurent Destailleur
d5eaaaaf3a Merge pull request #1248 from atm-maxime/develop 
Minor fix + new hook
 2013-09-27 06:12:26 -07:00
Laurent Destailleur
4eb4c5f922 Some users report they need more time 2013-09-27 11:04:21 +02:00
Maxime Kohlhaas
4a20a29521 Add hook on paiementcard + fix hook on expedition 2013-09-27 11:00:25 +02:00
Christophe Battarel
7bc39d7601 update changelog 2013-09-26 19:08:54 +02:00
Christophe Battarel
b7fe0cec34 fix bug on filter and sort 2013-09-26 19:05:56 +02:00
Maxime Kohlhaas
383e07d102 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-09-26 18:20:12 +02:00
Laurent Destailleur
470ccba80a Qual: Fix two awful code with hardcoded values. This remove also 2 TODO. 2013-09-26 15:41:04 +02:00
Laurent Destailleur
8e72727163 Add hidden option MAIN_ADD_EVENT_ON_ELEMENT_CARD because the new feature 
to have a button to create an event is not a "workflow" action so should
not appears with action buttons but somewhere else on page.
 2013-09-26 14:06:15 +02:00
Laurent Destailleur
ca24b45aa9 Merge pull request #1101 from PaulPoulain/940-develop 
940 develop
 2013-09-26 05:00:57 -07:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02:00
Laurent Destailleur
5ea7c34956 Fix: Opening agenda for a specific day 
Fix: No picto of thirdparty of contact if link is broken
 2013-09-25 21:26:06 +02:00
Laurent Destailleur
692ca4473d Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 20:04:30 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
60fbde02ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-25 19:08:01 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Laurent Destailleur
c88072433c Merge pull request #1244 from defrance69/patch-12 
Update commonobject.class.php
 2013-09-25 08:18:49 -07:00
Laurent Destailleur
fb60dc9338 Look: Minor enhancement 2013-09-25 12:58:29 +02:00
Laurent Destailleur
d111ee97c2 Doc 2013-09-25 12:37:19 +02:00
Laurent Destailleur
1f938e6596 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-25 12:16:54 +02:00
Laurent Destailleur
f5387081e0 Update doc 2013-09-25 11:25:30 +02:00
BENKE Charles
1c988fc559 Update commonobject.class.php 2013-09-25 11:14:50 +02:00
BENKE Charles
f88470d3b8 Update html.formcompany.class.php 
use paramter to select only active type of contact
 2013-09-25 10:17:27 +02:00
BENKE Charles
b400803a2a Update commonobject.class.php 
add complementary param
 2013-09-25 10:15:32 +02:00
Laurent Destailleur
b6a083596a Merge remote-tracking branch 'origin/3.4' into develop 2013-09-24 20:21:32 +02:00
Laurent Destailleur
06f668a249 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-24 20:20:41 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
12b15d3ae0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-24 18:23:02 +02:00
Laurent Destailleur
a7758bab0f Merge pull request #1245 from altairis-fr/develop 
fix bad margin calculation for credit notes
 2013-09-24 09:07:48 -07:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
Laurent Destailleur
ac8fd48865 Merge pull request #1238 from altairis-fr/develop 
add ability to copy contact address to clipboard
 2013-09-24 07:09:32 -07:00
Christophe Battarel
f13b9cec29 escape dialog title 2013-09-24 15:59:30 +02:00
Christophe Battarel
af06f53eaf clean changelog 2013-09-24 15:56:27 +02:00
Christophe Battarel
aa820d56ba Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
is reverts commit 8a4041e534.

Conflicts:

	htdocs/core/lib/company.lib.php
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
	htdocs/societe/class/societe.class.php

Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2013-09-24 15:52:19 +02:00
BENKE Charles
d978d64d59 Update commonobject.class.php 
just the active type of contact
 2013-09-24 14:19:52 +02:00
Laurent Destailleur
2088eaa6fd Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-24 13:17:58 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-23 21:07:13 +02:00
Laurent Destailleur
99de8b22a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-23 19:59:52 +02:00