Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
51,986 Commits 36 Branches 190 Tags
e67be201ed800ae34b8b83669ca1bf2d5823384c
Commit Graph

3693 Commits

Author SHA1 Message Date
Laurent Destailleur
cdc408a84c Fix: button "now" was not working on date using no javascript 2015-12-17 17:16:26 +01:00
Laurent Destailleur
ba3c8de785 Update doc comment to make things cleaner to avoid confusion between old 
deprecated doActions of canvas and doActions of triggers.
 2015-12-17 14:01:22 +01:00
Laurent Destailleur
acc4623b74 Merge pull request #4236 from defrance/patch-90 
fix ErrorBadValueForParamNotAString shit one again...
 2015-12-16 19:25:39 +01:00
Laurent Destailleur
4ef832b94b Merge pull request #4215 from frederic34/patch-7 
Update sms.php
 2015-12-16 19:02:07 +01:00
BENKE Charlie
afe3e6ac27 fix ErrorBadValueForParamNotAString shit one again... 2015-12-16 12:38:32 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Frédéric FRANCE
1aa232c4a7 Update CSMSFile.class.php 2015-12-13 21:14:53 +01:00
Laurent Destailleur
4d11c8b733 Merge pull request #4212 from frederic34/patch-7 
typo
 2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399 Merge pull request #4214 from frederic34/patch-8 
typo
 2015-12-13 19:39:56 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
7db6ac592f FIX Option start tls of ldap was not correctly supported. 2015-12-13 15:51:52 +01:00
Frédéric FRANCE
9cc77787c5 typo 2015-12-12 16:10:36 +01:00
Frédéric FRANCE
442f669dc7 typo 2015-12-12 10:45:33 +01:00
Frédéric FRANCE
e193d9be97 Update CSMSFile.class.php 2015-12-10 23:08:21 +01:00
phf
2f5f6c9ead NEW hidden conf to use input file multiple from mail form 2015-12-10 13:48:37 +01:00
Laurent Léonard
05234390f2 Fix uniqueness of objects reference 2015-12-07 02:02:03 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
Laurent Destailleur
43ab23ca28 Fix doxygen 2015-12-03 14:54:39 +01:00
Laurent Destailleur
480a398f36 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php
 2015-12-03 13:06:20 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +01:00
Laurent Destailleur
cb8227f086 Fix syntax error 2015-12-03 10:04:13 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
Florian HENRY
bd632cf2b0 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-02 12:12:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
863f81160f Merge pull request #4116 from IonAgorria/patch-2 
Only print : when both $h and $m are set
 2015-11-30 18:54:50 +01:00
Sof
09b61fd185 Update extrafields.class.php 2015-11-30 18:06:15 +01:00
Sof
5dab92836b FIX: Warning: implode(): Invalid arguments passed 
Declare array type before implode to avoid warning
 2015-11-30 12:27:58 +01:00
Ion Agorria
d518b24d55 Only print : when both $h and $m are set 2015-11-29 16:19:30 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
ebe4867ab1 Remove useless information tomake screen lighter 2015-11-29 01:23:41 +01:00
Laurent Destailleur
263be5aa0a Avoid 2 lines on mall screen 2015-11-29 01:16:56 +01:00
Laurent Destailleur
7b6d8dd23e Fix for smartphone 2015-11-29 01:13:23 +01:00
Laurent Destailleur
fcdb3af708 Merge pull request #4106 from aspangaro/develop-skype 
New: Better integration of skype for dolibarr 3.9
 2015-11-28 16:31:35 +01:00
Laurent Destailleur
3485e351a4 Fix do not jump to top of page when clicking on "Link to order" 2015-11-28 15:46:20 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
phf
cbcb79b1eb FIX jquery select of project generate js error on change event 2015-11-27 16:58:28 +01:00
aspangaro
9817ce8b20 Merge remote-tracking branch 'Upstream/develop' into develop-skype 2015-11-26 07:12:04 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
f353464bce Prepare code to fix #4095 2015-11-26 00:47:17 +01:00
aspangaro
3457a732f5 New: Better integration of skype 2015-11-25 20:19:18 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos 
Add profile escpos printer
 2015-11-22 17:09:15 +01:00
frederic34
6b4b70bdbb translations and help 2015-11-22 14:11:33 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
frederic34
bfd97d5226 Add profile escpos printer 2015-11-22 11:04:27 +01:00