Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
39,045 Commits 36 Branches 189 Tags
4958d17d248a5f5ff403274bd437c0ab34a7d888
Commit Graph

33600 Commits

Author SHA1 Message Date
Laurent Destailleur
4958d17d24 Doxygen 2013-10-08 00:42:28 +02:00
Laurent Destailleur
51a82a2418 Fix: Clean param 2013-10-08 00:04:09 +02:00
Laurent Destailleur
b778700c95 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contact/fiche.php
 2013-10-07 22:52:14 +02:00
Laurent Destailleur
c235c4e4ba Fix: security sql injection 2013-10-07 22:50:27 +02:00
Laurent Destailleur
ebb1dbcec3 Fix: security sql injection 2013-10-07 22:50:12 +02:00
Laurent Destailleur
3f94af792b Fix: security sql injection 2013-10-07 22:49:33 +02:00
Laurent Destailleur
47a9837046 Uniformize ref_customer into list 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
 2013-10-07 21:58:12 +02:00
Laurent Destailleur
c35135b62b Fix: use css3 2013-10-07 16:59:38 +02:00
Laurent Destailleur
123beb1e34 Fix: Bad property 2013-10-07 16:58:07 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Christophe Battarel
37e47272c7 fix bugs on margin reports 2013-10-05 10:21:38 +02:00
Laurent Destailleur
2e3aad282c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-04 15:10:06 +02:00
Laurent Destailleur
2ffb16b99d Fix: permissions on files. 2013-10-02 23:48:13 +02:00
Laurent Destailleur
61f583e035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-02 16:19:54 +02:00
Laurent Destailleur
4a59a99190 Fix: No filter when already on filtered warehouse. 2013-10-02 16:19:35 +02:00
Laurent Destailleur
3fb890e9b7 New: Add total of unique different product into warehouse 2013-10-02 12:49:28 +02:00
Florian Henry
d41ceae64a - New: Can choose contact on event (action com) creation, and filtred by 
thirdparty
 2013-10-01 18:11:53 +02:00
Laurent Destailleur
2061739371 Fix: Update must be done with id 2013-10-01 17:49:56 +02:00
Laurent Destailleur
957ff08458 New: Add update method for web service product. 2013-10-01 11:59:35 +02:00
Laurent Destailleur
cf89a8e96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-29 19:22:16 +02:00
Laurent Destailleur
fc77bd26ee Sync from transifex 2013-09-29 19:21:59 +02:00
Laurent Destailleur
9244d4e58e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-29 14:01:29 +02:00
Laurent Destailleur
601de7a308 Fix: Test not working 2013-09-29 14:00:56 +02:00
Laurent Destailleur
abe7946883 Synchro with transifex 2013-09-28 19:54:28 +02:00
Laurent Destailleur
7544c7e5a4 Synchro with transifex 2013-09-28 18:10:42 +02:00
Laurent Destailleur
9891e32962 Fix: Removed duplicate entry 2013-09-28 16:50:55 +02:00
Laurent Destailleur
b695204259 Fix: invert parameters 2013-09-28 13:27:53 +02:00
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
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
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
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
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
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