Commit Graph

80271 Commits

Author SHA1 Message Date
Frédéric FRANCE
0c0b476535
restore some files 2019-10-31 20:56:42 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d Use popup 2019-10-31 14:57:05 +01:00
Laurent Destailleur
dcbe7fe8da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-31 14:06:36 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
Laurent Destailleur
b296f62671 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Laurent Destailleur
8f5b0f5d4d
Merge pull request #12207 from altatof/sortcontact
Sort contacts by lastname, firstname instead of nothing
2019-10-30 03:27:42 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019
add some comment
2019-10-30 03:17:21 +01:00
Laurent Destailleur
811a30c9c2
Merge pull request #12212 from frederic34/patch-3
Update adherent.class.php
2019-10-30 03:16:46 +01:00
Laurent Destailleur
19f97fb23b
Merge pull request #12211 from frederic34/patch-2
doxygen product.class.php
2019-10-30 03:16:22 +01:00
Laurent Destailleur
5cbed0a6ed
Merge pull request #12220 from frederic34/patch-8
css
2019-10-30 03:13:39 +01:00
Laurent Destailleur
923ab59e4e
Merge pull request #12219 from frederic34/patch-7
css
2019-10-30 03:13:14 +01:00
Laurent Destailleur
86b8804c24
Merge pull request #12221 from aspangaro/develop
Use fontawesome 5
2019-10-30 03:12:54 +01:00
Laurent Destailleur
0e667776e9
Merge pull request #12225 from ptibogxiv/patch-270
NEW Get thirdparty's salesrepresentatives by API
2019-10-30 03:12:20 +01:00
Laurent Destailleur
f73356ab8c
Merge pull request #12218 from frederic34/patch-6
css
2019-10-30 03:11:47 +01:00
Laurent Destailleur
488edec3a8
Merge pull request #12226 from ptibogxiv/patch-271
NEW add office phone & job on user tooltips
2019-10-30 03:11:28 +01:00
Laurent Destailleur
58188423e2
Merge pull request #12227 from ptibogxiv/patch-272
Fix php error display
2019-10-30 03:10:02 +01:00
Laurent Destailleur
793923319c
Merge pull request #12228 from frederic34/patch-11
css
2019-10-30 03:08:56 +01:00
Laurent Destailleur
9a10b4ef38
Merge pull request #12229 from frederic34/patch-13
css
2019-10-30 03:08:38 +01:00
Laurent Destailleur
c2e630ac49
Merge pull request #12231 from frederic34/patch-14
make graph bigger and combine small value
2019-10-30 03:08:13 +01:00
Laurent Destailleur
d5e5cdb1a2
Merge pull request #12230 from grandoc/new_branch_25_10_2019
useless code
2019-10-30 03:07:20 +01:00
Laurent Destailleur
ad608d0cb9
Update payment.php 2019-10-30 03:07:02 +01:00
Laurent Destailleur
f17738e0c2
Merge pull request #12232 from frederic34/patch-15
css
2019-10-30 03:04:17 +01:00
Laurent Destailleur
2770f79a86
Merge pull request #12216 from frederic34/patch-5
css
2019-10-30 03:02:24 +01:00
Laurent Destailleur
26a58682b0
Merge pull request #12217 from andreubisquerra/develop
REF to customer readable place in TakePOS BAR
2019-10-30 03:01:49 +01:00
Laurent Destailleur
6769efc372
Merge pull request #12234 from frederic34/patch-17
Update list.php
2019-10-30 03:00:03 +01:00
Laurent Destailleur
5947973388
Merge pull request #12245 from OPEN-DSI/fix-contact-card-select-state
FIX contact card state address selected after filling addresss
2019-10-30 02:59:36 +01:00
Laurent Destailleur
350e01a5a3
Update card.php 2019-10-30 02:59:24 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19
Update html.formmail.class.php
2019-10-30 02:57:27 +01:00
Laurent Destailleur
6073692654
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric
Fix non-numeric error in sort event function
2019-10-30 02:57:00 +01:00
Laurent Destailleur
c952c7e3c2
Merge pull request #12237 from grandoc/new_branch_26_10_2019
Internationalization
2019-10-30 02:53:34 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone
Contactphone
2019-10-30 02:52:11 +01:00
Laurent Destailleur
7e4ceeb08a
Merge pull request #12244 from TobiasSekan/FixInvoiceSupplierCountArray
Fix count array for invoice supplier
2019-10-30 02:51:06 +01:00
Laurent Destailleur
cbc57f15d1
Merge pull request #12242 from frederic34/patch-20
Update contact.class.php
2019-10-30 02:49:31 +01:00
Laurent Destailleur
4ea69abd89
Merge pull request #12249 from oscim/patch-7
Update modulehelp.php
2019-10-30 02:44:32 +01:00
Laurent Destailleur
45cc859484
Merge pull request #12254 from iouston/patch-11
NEW : add name_alias in fields to search all
2019-10-30 02:43:19 +01:00
Laurent Destailleur
f91a4bab38
Merge pull request #12253 from oscim/patch-9
Update modulehelp.php
2019-10-30 02:42:16 +01:00
Laurent Destailleur
bf0400a29b
Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
2019-10-30 02:41:59 +01:00
Laurent Destailleur
a00d762ad9
Merge pull request #12255 from grandoc/new_branch_29_10_2019
missing error message
2019-10-30 02:24:19 +01:00
Laurent Destailleur
bdde01104b
Merge pull request #12256 from iouston/patch-12
NEW : add name_alias in fields to search all
2019-10-30 02:22:54 +01:00
Laurent Destailleur
33a1923861
Merge pull request #12261 from OPEN-DSI/fix-projet-element-linkto
FIX remove backward compatibility projectid and uses object id instead
2019-10-30 02:22:05 +01:00
Laurent Destailleur
f03bf149bd Fix autoselect of field with modulebuilder 2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
beb85ee3a8 Work on MO 2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
VESSILLER
d28242a3c5 FIX remove backward compatibility projectid and uses object id instead 2019-10-29 16:40:47 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00