Commit Graph

89109 Commits

Author SHA1 Message Date
stickler-ci
a60968e95b Fixing style errors. 2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34 allow default settings for "cond_reglement_id" and "mode_reglement_id"
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
2020-08-24 16:08:44 +02:00
Sekan, Tobias
6d2aa6b654 Fix non-numeric value 2020-08-24 15:26:06 +02:00
Sekan, Tobias
4c887d6110 Fix for non-numeric value in payment 2020-08-24 14:53:34 +02:00
ptibogxiv
ff621cb146
Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955
Fix for better code 2020-08-24 12:26:40 +02:00
Alexandre SPANGARO
335f57f9be Fix language 2020-08-24 11:41:00 +02:00
Alexandre SPANGARO
eebe888377 Some fix on assets 2020-08-24 09:47:37 +02:00
Christian Foellmann
b1849aed5c fix for mistakenly uncommented code 2020-08-24 07:53:25 +02:00
stickler-ci
721b1275ff Fixing style errors. 2020-08-23 23:20:07 +00:00
StephaneLesage
5aac080e61 NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms 2020-08-24 01:01:35 +02:00
Laurent Destailleur
14a4cae95b Fix 2020-08-24 00:31:25 +02:00
Laurent Destailleur
689fa752bf Implement action "Decline" 2020-08-24 00:23:18 +02:00
Laurent Destailleur
633f03e853 Add extrafields for recruitment 2020-08-24 00:09:04 +02:00
andreubisquerra
915aa56a95
Change variable to pos_change 2020-08-23 22:29:55 +02:00
andreubisquerra
8f933c324a
Change variable to pos_change 2020-08-23 22:28:26 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change 2020-08-23 22:27:18 +02:00
andreubisquerra
ec2479a41a
Update 12.0.0-13.0.0.sql 2020-08-23 22:26:22 +02:00
andreubisquerra
f9913be719
Change variable to pos_change 2020-08-23 22:24:46 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change 2020-08-23 22:22:05 +02:00
Laurent Destailleur
f010e44a71 WIP 2020-08-23 22:13:06 +02:00
Laurent Destailleur
80ccb84fb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-23 22:11:33 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
5aaf567f22
Merge pull request #14364 from bafbes/abb120130
fix: restore autofill lost functionality on expeditions
2020-08-23 19:52:21 +02:00
Laurent Destailleur
a6f838a6e0
Update card.php 2020-08-23 19:51:13 +02:00
Laurent Destailleur
0944e8b156 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:13 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
d765b03bd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-23 19:23:57 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/lib/pdf.lib.php
2020-08-23 19:20:50 +02:00
Laurent Destailleur
49f8a6e733 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:12 +02:00
Laurent Destailleur
4fa6d86127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:01 +02:00
Laurent Destailleur
03557b69c2
Merge pull request #14486 from atm-john/9.0_fix_infinite_fetch_loop
FIX : infinite fetch object linked loop
2020-08-23 19:14:08 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php 2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php 2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php 2020-08-23 19:11:19 +02:00
Laurent Destailleur
815269db9c FIX #14443 2020-08-23 18:49:19 +02:00
Laurent Destailleur
7a53e191a9
Merge pull request #14511 from frederic34/patch-6
Use of undefined constant state - assumed 'state'
2020-08-23 18:27:28 +02:00
Laurent Destailleur
477c3e719d Fix phpcs 2020-08-23 18:26:42 +02:00
Laurent Destailleur
90e01888d4
Merge pull request #14507 from pstructures/PSdevelop
Projects added as type in Categories API
2020-08-23 18:25:08 +02:00
Laurent Destailleur
55c0c1d734
Merge pull request #14514 from FHenry/develop
fix php warning : count parameters must be countable
2020-08-23 18:22:35 +02:00
Laurent Destailleur
2bc54793bb
Merge pull request #14523 from TobiasSekan/ParseTranspAndPrioFromExternalCalendar
NEW Priority and transparency from external calendar events
2020-08-23 18:21:37 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar 2020-08-23 18:21:18 +02:00
Laurent Destailleur
2b8a1570f9
Merge pull request #14512 from StephaneLesage/import-product-warehouse-usebatch
NEW: Products Import/Export 'default warehouse' and 'use batch' fields
2020-08-23 18:19:59 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents
NEW Show place from events on import calender
2020-08-23 18:11:02 +02:00
Laurent Destailleur
e32b99fb21
Merge pull request #14515 from ptibogxiv/patch-346
Fix Stripe icon in balance list
2020-08-23 18:10:11 +02:00
Laurent Destailleur
9c74211873
Merge pull request #14508 from b92/develop
NEW Add __TYPE__ substitution key
2020-08-23 18:09:49 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5
Some fix on complete_head_from_modules
2020-08-23 18:09:15 +02:00
Laurent Destailleur
b1b88676b0
Merge pull request #14518 from aspangaro/12.0_p7
Fix Missing language key
2020-08-23 18:07:43 +02:00