Commit Graph

90290 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6685cc5bc8
Update admin.lang 2020-08-23 18:07:18 +02:00
Laurent Destailleur
bd7261a449 Debug recruitment module 2020-08-23 18:04:52 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang 2020-08-23 18:04:02 +02:00
Laurent Destailleur
a4c34c2bc5 NEW Add Manufacturing Orders into the automatic ECM 2020-08-23 15:19:03 +02:00
Laurent Destailleur
3fe0ffe7e2 Add unique index on email_msgid of candidatures 2020-08-23 15:18:31 +02:00
Laurent Destailleur
34d2d9a7c6 Look and feel v13 2020-08-23 15:17:22 +02:00
Laurent Destailleur
ca2a34a4c9 Standardize code: Rename fields date_m into tms. All timestamp fields
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
46a6161323 Trans 2020-08-23 13:30:05 +02:00
Alexandre SPANGARO
bf28201685 Fix Missing language key 2020-08-23 07:13:43 +02:00
Alexandre SPANGARO
015e1a8dab Merge branch '12.0' into 12.0_p7 2020-08-23 07:07:47 +02:00
Laurent Destailleur
f56b7c5330 Removed one useless column 2020-08-23 02:45:19 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
andreubisquerra
e36eb42568
Fix travis 2020-08-22 18:46:39 +02:00
andreubisquerra
e8c8cb53cb
Fix travis 2020-08-22 18:45:54 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Laurent Destailleur
e9346298b2 trans 2020-08-22 15:48:42 +02:00
Laurent Destailleur
03af14294a Standardize code. Debug module HRM 2020-08-22 15:29:19 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
ac1ae7a0d2 Debug 2020-08-22 04:05:31 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
f07a09bc80 Fix missing include 2020-08-22 02:19:58 +02:00
Laurent Destailleur
f4ed84f27d Trans 2020-08-21 22:18:02 +02:00
Laurent Destailleur
a508e7ae08 Migration 2020-08-21 22:17:20 +02:00
Laurent Destailleur
e6616563d2 Fix size of field 2020-08-21 22:01:28 +02:00
Laurent Destailleur
6ad18ceef0 Remove useless code 2020-08-21 19:48:31 +02:00
stickler-ci
183013e9ed Fixing style errors. 2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe Parse priority and transparency from external calender events 2020-08-21 13:57:03 +02:00