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

37011 Commits

Author SHA1 Message Date
KreizIT
180cc0b200 Add description for new param 2014-08-06 17:12:28 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
KreizIT
cfe35f32e8 - Add improvement to GETPOST function 
- Review thirdparty cards for illustration of new GETPOST functionality
 2014-08-06 15:59:36 +02:00
Maxime Kohlhaas
546b31b9d0 Fix : Filtering on fourn paiement list was not working 2014-08-06 12:02:44 +02:00
Maxime Kohlhaas
27266ba7e1 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-06 11:53:56 +02:00
Maxime Kohlhaas
5e63f16d32 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2014-08-06 09:58:10 +02:00
Laurent Destailleur
cffc92a5c0 Fix: PHPCS 2014-08-06 09:46:09 +02:00
Laurent Destailleur
82921232f5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2014-08-06 09:27:01 +02:00
Laurent Destailleur
2169a8668d Fix: PHPCS 2014-08-06 09:18:44 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/holiday/fiche.php
 2014-08-06 09:12:29 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore. 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2014-08-06 09:08:28 +02:00
Maxime Kohlhaas
3499c69b7d Fix : search contact by phone was mistaking phone pro and phone perso 2014-08-06 08:54:22 +02:00
Laurent Destailleur
4bd257f007 New: Work on type of leave. 2014-08-06 03:23:16 +02:00
Laurent Destailleur
bbb58dd365 New: Add navigation on year on page of leaves. 2014-08-06 03:09:59 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
Laurent Destailleur
83564b2b04 Fix: Table holiday_user was not initialized anymore. 2014-08-06 02:43:50 +02:00
Laurent Destailleur
75f01cbead Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2014-08-06 01:50:22 +02:00
Laurent Destailleur
8f73c7a82a Fix: Remove debug 2014-08-06 01:49:22 +02:00
Laurent Destailleur
9b9e51d50f Fix: removed debug 2014-08-06 01:48:51 +02:00
Laurent Destailleur
277bfc8012 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 01:46:57 +02:00
Laurent Destailleur
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2014-08-06 01:45:31 +02:00
Laurent Destailleur
1751b58ef8 New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or 
content template.
 2014-08-06 00:46:00 +02:00
Laurent Destailleur
e77be9e529 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 00:15:14 +02:00
Laurent Destailleur
0514fa02d5 Clean path dolibarr_main_url_root to avoid duplicate /. 2014-08-06 00:06:27 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
0397fa7dc3 Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:18:36 +02:00
Laurent Destailleur
2624632fde Fix: bad test commande_send -> order_send 2014-08-05 19:55:14 +02:00
Laurent Destailleur
e95a9cad03 New: When force of bcc is set, we show it onto email form. 2014-08-05 19:32:24 +02:00
Laurent Destailleur
3a4a1a4c72 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-05 18:28:52 +02:00
Laurent Destailleur
5027222c33 Fix: When there is an error to update a thirdparty, the number for 
supplier and customer code is kept to old value.
 2014-08-05 18:28:06 +02:00
Laurent Destailleur
ee3f92a168 Fix: When there is an error to update a thirdparty, the number for 
supplier and customer code is kept to old value.
 2014-08-05 18:22:01 +02:00
Maxime Kohlhaas
1b3efbb9a3 New : add attachments on user cards 2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
4f47bddd0a New : Intervention documents are now available in ECM module (files downloadable) 2014-08-05 16:00:56 +02:00
Maxime Kohlhaas
90c397d1a4 New: Intervention documents are now available in ECM module 2014-08-05 15:24:49 +02:00
Maxime Kohlhaas
269a59e11a Fix : warning was not calculated on the right date 2014-08-05 14:17:29 +02:00
Laurent Destailleur
f863604621 Prepare table for email templates. 2014-08-05 12:28:10 +02:00
Raphaël Doursenaud
d09f4bed21 Fixed typo 2014-08-05 10:50:41 +02:00
Laurent Destailleur
164c9e0b75 New: Can defined a bcc for each email type. 2014-08-05 09:28:58 +02:00
Laurent Destailleur
17aed0f360 Prepare to be able to send bcc according to email type. 2014-08-05 09:28:07 +02:00
Laurent Destailleur
20d6920a0c Add comment 2014-08-05 09:27:40 +02:00
Laurent Destailleur
9436b1d046 New: Prepare to be able to defined a bcc for each type of email sent 
from dolibarr.
 2014-08-05 09:26:40 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
b8a0f6aec9 New: Add option to foce delivery receipt to yes 2014-08-04 19:03:15 +02:00
Laurent Destailleur
4e8ec8e598 Revert "Add Reduction value in pdf" 
This reverts commit 0b5707c1cf.
 2014-08-04 18:36:18 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard 
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
 2014-08-04 12:49:54 +02:00
Laurent Destailleur
96362b40e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 10:55:09 +02:00
Laurent Destailleur
be89fddc52 Uniformize field list 2014-08-04 10:54:22 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Laurent Destailleur
c7d4b1e3d5 Merge pull request #1802 from FHenry/3.6 
Fix extrafield parameters for sellist
 2014-08-04 09:13:42 +02:00
Laurent Destailleur
50f18ff939 Merge pull request #1801 from fmarcet/develop 
Fix: Optimize Price by Customer
 2014-08-04 09:12:35 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5 
Fix : Fusion PDF button on unpaid invoice is no more displayed
 2014-08-04 09:08:47 +02:00
Laurent Destailleur
defb9a772f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-04 09:06:57 +02:00
Laurent Destailleur
7ac22cf7d2 Qual: no more currency into output, must be included into price function 2014-08-04 09:05:51 +02:00
Laurent Destailleur
8d867dde69 Merge pull request #1797 from Devensys/Develop-AddValueReduction 
Add Reduction value in pdf
 2014-08-04 09:01:45 +02:00
Laurent Destailleur
3024d82536 Merge pull request #1786 from atm-maxime/develop 
Fix on class not extending commonobject
 2014-08-04 08:58:54 +02:00
Laurent Destailleur
e56956110f Merge pull request #1796 from atm-maxime/3.5 
Fix : shipping list SQL request was not filtering on shipping element
 2014-08-04 08:58:41 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
0834178bf5 Add more colors to fix pb with agenda 2014-08-04 00:15:08 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
86b2887d44 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-03 23:54:05 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Laurent Destailleur
4c91788941 Fix: Can not set option when using in nojs mode. 2014-08-03 22:08:25 +02:00
Laurent Destailleur
1f2cc71975 New: Supervisor is now visible into user list. 2014-08-03 11:36:00 +02:00
Laurent Destailleur
42008ae8cb Fix: Bad translation 2014-08-03 11:35:35 +02:00
Laurent Destailleur
12ff7a8af5 Look: Refresh install style with more neutral colors. Select line style 
is now stored into css. Removed all images for install process.
 2014-08-03 11:18:32 +02:00
Laurent Destailleur
c11ff57fbe Fix: The type is a code so must not contains any space. 
Fix: State is not linked to region.
 2014-08-03 11:17:24 +02:00
Laurent Destailleur
331cb38a10 A little clean of tables. 2014-08-02 21:56:39 +02:00
Laurent Destailleur
8ed21f606e Qual: states are linked to regions. 2014-08-02 21:16:43 +02:00
Laurent Destailleur
9eab1f51cc Fix: remove debug output 2014-08-02 17:27:45 +02:00
Laurent Destailleur
6ff57e57c2 Fix: external link is visible when a module is using tabhelp of 
dictionary.
 2014-08-02 00:34:54 +02:00
Laurent Destailleur
6a815dd585 Fix: external link is visible when a module is using tabhelp of 
dictionary.
 2014-08-02 00:34:15 +02:00
Laurent Destailleur
7c1af329f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2014-08-01 22:26:17 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Juanjo Menent
eee17589b2 Fix: Price by customer: a client must be able to have multiple products 
with customer prices
 2014-08-01 18:24:38 +02:00
Juanjo Menent
c15da5f257 Fix: Price by customer: a client must be able to have multiple products 
with customer prices
 2014-08-01 18:22:39 +02:00
Laurent Destailleur
41f846ac6e Fix: Bad param 2014-08-01 17:13:23 +02:00
Laurent Destailleur
1c39e7ecbd Fix: Bad param 2014-08-01 17:11:18 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
767ca07374 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 16:48:59 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Laurent Destailleur
ed52fc20d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 14:51:58 +02:00
Laurent Destailleur
605919be76 Fix: Too many parameter 
Fix: Can't delete bank account
 2014-08-01 14:51:40 +02:00
Andrelec1
0b5707c1cf Add Reduction value in pdf 
Add value of %reduction in pdf
 2014-08-01 14:49:42 +02:00
Laurent Destailleur
c6d491b0b9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 14:49:24 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Juanjo Menent
268aabbacd Fix: Price by customer 2014-08-01 13:27:54 +02:00
Juanjo Menent
32e110b6d9 Fix: Price by customer 2014-08-01 13:25:29 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Maxime Kohlhaas
94fee7af70 Call trigger added in commonobjectline 2014-08-01 08:59:08 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/main.lang
 2014-08-01 02:05:38 +02:00
Laurent Destailleur
33a60bc14e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 02:02:14 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for 
constants into database driver classes.
 2014-08-01 00:53:29 +02:00
Laurent Destailleur
1e09200347 Prepare to add foreign key toward parent into table 
llx_accountingaccount.
 2014-07-31 20:49:50 +02:00
Laurent Destailleur
b78537730a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 20:39:03 +02:00
Laurent Destailleur
218fb88eef Merge pull request #1788 from aspangaro/develop-accounting2 
Accountancy :: account_parent must be an int (again)
 2014-07-31 20:17:49 +02:00
Laurent Destailleur
9fff30416a Qual: Remove usage of getStaticMember function dir constants. 2014-07-31 20:12:21 +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
41865f934c Merge pull request #1794 from frederic34/patch-1 
Update propal.php
 2014-07-31 17:50:14 +02:00
Laurent Destailleur
59e98f97e3 Merge branch 'develop' of github.com:grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-07-31 17:47:32 +02:00
Laurent Destailleur
95da79108f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 17:22:37 +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
Philippe Grand
5aea97affd Update fournisseur.commande.class.php 
missing code for extrafields
 2014-07-31 17:02:17 +02:00
frederic34
5f80e9ed20 Update propal.php 
Correct typo
 2014-07-31 16:52:00 +02:00
Maxime Kohlhaas
b2ad8c74a5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-31 15:19:20 +02:00
Laurent Destailleur
c70a7ee63a Merge pull request #1787 from frederic34/patch-facture 
User must not see invoices if no rights
 2014-07-31 14:38:46 +02:00
Maxime Kohlhaas
d8ede4147d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-31 11:55:36 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +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
Marcos García de La Fuente
a779eea202 Restored JSON reimplementation 2014-07-30 15:17:57 +02:00
Laurent Destailleur
55a51a9724 Merge pull request #1785 from defrance69/patch-9 
Update expedition.class.php
 2014-07-30 14:09:57 +02:00
Laurent Destailleur
141895b904 Merge pull request #1781 from GPCsolutions/categoriesfix 
Fix categories creation
 2014-07-30 11:36:55 +02:00
Laurent Destailleur
86b410ab22 Merge pull request #1780 from icfr/develop 
order task on pdf
 2014-07-30 11:36:29 +02:00
Laurent Destailleur
882af6405b Merge pull request #1779 from aspangaro/develop-patch1 
Presentation from invoice page
 2014-07-30 11:36:10 +02:00
Laurent Destailleur
2d97ad5177 Merge pull request #1771 from frederic34/selectdelivery 
Select Shipping Method in Propal, Order
 2014-07-30 11:31:22 +02:00
aspangaro
a12f4da978 Accountancy :: account_parent must be an int (again) 2014-07-30 05:49:16 +02:00
Laurent Destailleur
600801a442 - New: First change to match accessibility rules: 
http://www.w3.org/TR/WCAG10-HTML-TECHS/
Differentiate text and img.
Use label into quick search form.
Use accesskey on form search.
 2014-07-29 22:04:53 +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
6226d39cda Fix: Pb when option javascript disabled. 2014-07-29 19:45:48 +02:00
frederic34
fada3ca9a2 User must not see invoices if no rights 2014-07-29 16:27:34 +02:00
Maxime Kohlhaas
d8cf23ad95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-29 15:46:50 +02:00
Maxime Kohlhaas
6349e5e4a2 Class MouvementStock was not extending CommonObject so error on call_trigger function 2014-07-29 15:45:53 +02:00
BENKE Charles
18f6718e06 Update expedition.class.php 
fetch line on expedition in the same order than the customer order
 2014-07-29 14:06:31 +02:00
BENKE Charles
fb4e64fdab Update consumption.php 
security access fix : we don't have right to access of invoice and order if we are not agreed
 2014-07-29 11:28:46 +02:00
Raphaël Doursenaud
6bff4dde77 Fix categories creation 2014-07-29 11:15:32 +02:00
icfr
c80d1285e3 order task on pdf 2014-07-29 07:11:25 +02:00
aspangaro
dcb507fd37 Presentation invoice page 2014-07-29 06:55:28 +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
Juanjo Menent
2783ec7dc8 New: Add PYME (base) accountancy spanish plan 2014-07-29 00:00:34 +02:00
Juanjo Menent
09af3e1efe New: Add PYME (base) accountancy spanish plan 2014-07-28 23:22:50 +02:00
Laurent Destailleur
1f936ef584 Better text to describe reason of option 2014-07-28 21:43:06 +02:00
Laurent Destailleur
096a61d5c0 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:35:32 +02:00
Laurent Destailleur
21c7972f7e Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:51 +02:00
Laurent Destailleur
6d7b50d5d4 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:42 +02:00