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

42914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
131c8398ce Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 00:13:48 +02:00
Laurent Destailleur
b182b2ff44 Update changelog 2014-08-06 00:11:42 +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
Laurent Destailleur
f863604621 Prepare table for email templates. 2014-08-05 12:28:10 +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
8167f30833 Fix: Exclude dev dir from bin package. 2014-08-04 01:25:38 +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