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

72306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
diversity-co-uk
2dc87509ff Fix Invoice PUT, remove extra parameter 
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this

See facture.class.php 1610:
function update(User $user, $notrigger=0)
 2019-01-08 14:17:33 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
6ca163c68b
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list 
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
 2019-01-08 14:06:24 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Laurent Destailleur
1e79781cba Clean parameters 2019-01-08 11:54:08 +01:00
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +01:00
Laurent Destailleur
5d0ff28556 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
 2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
 2019-01-08 01:48:54 +01:00
Laurent Destailleur
8e3df45cbf Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
 2019-01-08 01:46:03 +01:00
Laurent Destailleur
f85389ac29 Fix missing td column 2019-01-08 01:11:34 +01:00
Laurent Destailleur
41743056bf Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 01:09:21 +01:00
Laurent Destailleur
087a4400b0 FIX Default value on sales representative on third party creation 2019-01-08 01:05:42 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
 2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41 Sync transifex 2019-01-07 19:39:41 +01:00
Laurent Destailleur
8b1455f29e FIX Cash fence 2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
Laurent Destailleur
b7c73d9460 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-07 18:09:35 +01:00
Laurent Destailleur
d7406685f8 Fix transifex file 2019-01-07 18:08:38 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
Laurent Destailleur
ca2477a250
Merge pull request #10310 from AXeL-dev/patch-5 
FIX run_sql function: support for numbers in database prefix
 2019-01-07 14:10:46 +01:00
Laurent Destailleur
3d578cab28
Merge pull request #10308 from EuskalMoneta/7.0 
FIX Civility not saved when creating a member.
 2019-01-07 14:10:00 +01:00
Laurent Destailleur
45ceab8294
Merge pull request #10306 from mapiolca/patch-3 
NEW Can add more lines on situation invoices at end of project when there is extra to add.
 2019-01-07 14:09:46 +01:00
Laurent Destailleur
34413727d8 Fix 2019-01-07 13:50:59 +01:00
AXeL-dev
66e1df753e run_sql function: support for numbers in database prefix 2019-01-07 09:33:24 +01:00
Xebax
fbb1b344d1 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-06 13:44:13 +01:00
Xebax
2c496d2ac0 FIX Civility not saved when creating a member. 2019-01-06 13:42:41 +01:00
Laurent Destailleur
3d4879c538 Code comment 2019-01-06 05:16:50 +01:00
Laurent Destailleur
bac598965e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:19 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
Laurent Destailleur
38ec05f2f1 Fix search filter lost 2019-01-06 01:17:11 +01:00
mapiolca
bab82a77b5
Update card.php 
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
 2019-01-05 22:42:51 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +01:00
Laurent Destailleur
cbf1c30647 Fix better test tool 2019-01-05 15:19:07 +01:00
Laurent Destailleur
b5ad35f886 Fix better test tool 2019-01-05 15:18:37 +01:00
Laurent Destailleur
c9e6074551 Code clean 2019-01-05 15:14:06 +01:00
Laurent Destailleur
59d6000e89 Code comment 2019-01-05 15:13:35 +01:00
Juanjo Menent
18f8deb6e9
Merge pull request #10300 from grandoc/new_branch_04_01_2019 
fix : bad link
 2019-01-05 14:56:10 +01:00
Juanjo Menent
e8424ebec3
Merge pull request #10304 from simnandez/7.0 
Change to 7.0.6
 2019-01-05 14:47:24 +01:00
Juanjo Menent
74442911a7 Change to 7.0.6 2019-01-05 14:45:23 +01:00
Juanjo Menent
709d173669
Merge pull request #10303 from simnandez/7.0 
Fix #8152 and prepare 7.0.5
 2019-01-05 14:00:02 +01:00
Juanjo Menent
96967100ba Prepare 7.0.5 2019-01-05 13:35:32 +01:00
Juanjo Menent
7908550937 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-05 13:05:50 +01:00
Juanjo Menent
61fbfaf356
Merge pull request #10298 from fmarcet/7.0 
FIX: Can't generate invoice pdf
 2019-01-05 13:02:58 +01:00
ldestailleur
0ce514079b FIX Button journalize grey when mandatroy setup not done 2019-01-05 12:51:08 +01:00
Philippe GRAND
c289bd5e62 fix : bad link 2019-01-04 21:33:12 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00