lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,282 Commits 43 Branches 150 Tags 886 MiB
9a320cc50f
Commit Graph

41282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9a320cc50f Removed a function we should not have. 2014-04-25 20:18:26 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Laurent Destailleur
ae23d78c74 Add field nb_holidays and salary. 2014-04-25 20:06:19 +02:00
Laurent Destailleur
078a7f4162 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-23 21:19:06 +02:00
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop 
Fix : proposal validation was converting third as customer
 2014-04-23 21:18:34 +02:00
Laurent Destailleur
6c56302fd2 Merge pull request #1547 from GPCsolutions/jsinjection 
Qual: Prevent potential JS injection
 2014-04-23 21:14:22 +02:00
Laurent Destailleur
5e2c360d38 Merge pull request #1546 from GPCsolutions/linkfix 
Fix undeclared variable
 2014-04-23 21:13:06 +02:00
Laurent Destailleur
8d6e80d016 Merge pull request #1545 from GPCsolutions/dolidb 
Dolidb
 2014-04-23 21:12:43 +02:00
Laurent Destailleur
82d57c20cc Merge pull request #1542 from FHenry/develop 
add filter to effectif select
 2014-04-23 21:10:07 +02:00
Laurent Destailleur
1f4e6d69a1 Merge pull request #1541 from defrance69/patch-8 
Update propal.class.php
 2014-04-23 21:09:34 +02:00
Maxime Kohlhaas
d21ea0fe19 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-04-23 17:51:22 +02:00
Maxime Kohlhaas
b9865b9ccc Fix : proposal validation was converting third as customer 2014-04-23 17:50:47 +02:00
Raphaël Doursenaud
79fe0a1658 Qual: Prevent potential JS injection 2014-04-23 15:20:45 +02:00
Laurent Destailleur
9cadd882d2 Hide a column that is always 0. 2014-04-23 13:51:02 +02:00
Laurent Destailleur
01655d1757 New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send 
invoice
by email whatever is its status.
 2014-04-23 13:14:55 +02:00
Laurent Destailleur
002e64d514 Add table for email templates. 
Removed deprecated table llx_domain.
 2014-04-23 13:10:08 +02:00
Laurent Destailleur
caf6712286 Add message on disconnect button when using an authentication mode where 
disconnect has no sense.
 2014-04-23 12:29:41 +02:00
Laurent Destailleur
c1e349d110 Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
Raphaël Doursenaud
98120862f7 Qual: Moved duplicate method to base method 2014-04-23 12:15:18 +02:00
Laurent Destailleur
459e5f7472 Clean corrupted data for categories 2014-04-23 11:25:05 +02:00
Raphaël Doursenaud
e62edc0a72 Fix undeclared variable 2014-04-23 11:19:34 +02:00
Raphaël Doursenaud
16ede7c52c Qual: Moved duplicate methods to base method 2014-04-23 11:12:06 +02:00
Raphaël Doursenaud
5cbb1dd96d Qual: Removed useless method 
The method is already in the DoliDB base class
 2014-04-23 11:07:00 +02:00
Laurent Destailleur
0058bea8e0 Fix typo 2014-04-23 10:22:03 +02:00
Laurent Destailleur
5c653b3a34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-22 23:52:41 +02:00
Laurent Destailleur
2b191b6ef8 Uniformization and simplification of code. 2014-04-22 23:49:33 +02:00
Juanjo Menent
f97d162087 Merge pull request #1543 from GPCsolutions/taskautoevents 
Automatic events for project tasks
 2014-04-22 18:10:57 +02:00
Juanjo Menent
4c2469eb64 Merge pull request #1544 from GPCsolutions/tasktimefix 
Fixed typo
 2014-04-22 18:09:16 +02:00
Raphaël Doursenaud
d95b5e4a39 Fixed typo 2014-04-22 16:43:19 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Florian HENRY
ff597a899f add filter to effectif select 2014-04-22 11:20:19 +02:00
Juanjo Menent
d527c4cf73 Fix: Price min of composition is not supplier price min by quantity 2014-04-22 09:57:43 +02:00
Laurent Destailleur
0a8ab84b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-22 00:04:50 +02:00
Laurent Destailleur
76b5659d4c Optimize for small screen 2014-04-22 00:04:31 +02:00
BENKE Charles
ad9efb3961 Update propal.class.php 
it's this->lines who used on create propal function not this->products
 2014-04-21 15:40:08 +02:00
Laurent Destailleur
2b7c2a9040 Merge pull request #1535 from fxw/patch-1 
Update server_thirdparty.php
 2014-04-20 00:01:48 +02:00
Laurent Destailleur
825ae377b0 Merge pull request #1534 from squarou/develop 
Add 2 lang variables for new tab in adherent
 2014-04-19 23:59:24 +02:00
Laurent Destailleur
1c21dbc9e7 Merge pull request #1533 from FHenry/develop 
Add filter date and total line on bank writing list page
 2014-04-19 23:58:48 +02:00
Laurent Destailleur
41e300626b Merge pull request #1538 from defrance69/patch-6 
Patch 6
 2014-04-19 23:55:53 +02:00
BENKE Charles
c55e51d825 Update project.class.php 2014-04-19 14:59:42 +02:00
BENKE Charles
ebab7a0b62 Update element.php 2014-04-19 13:06:11 +02:00
BENKE Charles
cebbf1607c Update element.php 2014-04-19 13:00:42 +02:00
BENKE Charles
09d231ad0a Update project.class.php 2014-04-19 12:36:15 +02:00
BENKE Charles
0b78a04756 Update doc_generic_project_odt.modules.php 2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
2213128531 Fix: invert label for accountancy_code_sell 2014-04-18 12:08:12 +02:00
Laurent Destailleur
ee3592c976 Fix: invert label for accountancy_code_sell 2014-04-18 11:21:15 +02:00
Laurent Destailleur
229e5211c5 Sync from transifex 2014-04-18 11:04:12 +02:00
Laurent Destailleur
61f0d67da0 Avoid too long filenames 2014-04-16 23:00:30 +02:00
fxw
f86d49c1ac Update server_thirdparty.php 
For the method getListOfThirdParties, return all the extrafieldsOptions of the thirdParty Object
 2014-04-16 16:33:36 +02:00