2
0
forked from Wavyzz/dolibarr
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
562e219cc5 Merge pull request #12314 from frederic34/patch-7
add thirdparty email in box_propales
2019-11-04 20:51:57 +01:00
Laurent Destailleur
17ea978cea Merge pull request #12306 from frederic34/escpos
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
c276659acd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660 Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Frédéric FRANCE
6ad983bb7b Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166 Fix look and feel v11 2019-11-04 13:32:34 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Laurent Destailleur
d934f5e920 Fix wrap 2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae Fix css 2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103 css 2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843 css 2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6 Responsive 2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc Update box_propales.php 2019-11-03 23:55:04 +01:00
Frédéric FRANCE
317ba9c047 Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-03 23:49:36 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Frédéric FRANCE
877f40a1c8 price 2019-11-03 20:07:11 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Frédéric FRANCE
5a3347104f rework an experimental module 2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e rework an experimental module 2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec wip ticket printer 2019-11-02 21:15:48 +01:00
Frédéric FRANCE
3e2d89dc02 Update ticket.lib.php 2019-11-02 18:16:09 +01:00
Laurent Destailleur
2ee002fc80 Fix trans 2019-11-02 17:44:58 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
df750b6a9d Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
2019-11-02 13:40:27 +01:00
Laurent Destailleur
e087ac434d Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
04a5054e1c Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
2019-11-02 13:32:33 +01:00
Laurent Destailleur
906f30773d Merge pull request #12269 from atm-ph/new_edit_comment
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
d232b7a387 Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2 Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
stickler-ci
b43d06db37 Fixing style errors. 2019-11-02 10:55:24 +00:00
Laurent Destailleur
37f4ebb1b2 Update xcal.lib.php 2019-11-02 11:56:01 +01:00
Laurent Destailleur
68691ddd8a Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
d9f333d828 Merge pull request #12289 from frederic34/datetime
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
23d238c16d Merge pull request #12291 from frederic34/patch-15
give a value by default
2019-11-02 11:43:02 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00