Commit Graph

70916 Commits

Author SHA1 Message Date
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
0de1c5b69d
Update list.php
Invalid argument supplied for foreach() in /htdocs/asset/list.php on line 410
2019-11-03 23:29:28 +01:00
Frédéric FRANCE
7ecdfa7c96
oups 2019-11-03 22:51:42 +01:00
Frédéric FRANCE
569c543ca0
search 2019-11-03 22:34:57 +01:00
Laurent Destailleur
4909a21f8a Fix css 2019-11-03 22:09:20 +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
f242cf4cc1 Debug modulebuilder 2019-11-03 19:15:32 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Frédéric FRANCE
430be760f3
restore files modified by stickler 2019-11-03 17:13:27 +01:00
Frédéric FRANCE
b048a2b408
can print from takepos 2019-11-03 15:06:20 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module 2019-11-03 12:57:06 +01:00
stickler-ci
8007b22030 Fixing style errors. 2019-11-03 11:37:44 +00:00
ptibogxiv
44b80fdc44
Update type.php 2019-11-03 12:35:52 +01:00
ptibogxiv
871b6d9dd6
NEW change duration membertype 2019-11-03 12:35:05 +01:00
stickler-ci
c2d66a9e64 Fixing style errors. 2019-11-02 23:53:11 +00:00
Frédéric FRANCE
d797ea590e
rework an experimental module 2019-11-03 00:50:58 +01:00
Frédéric FRANCE
6cb5f28db1
wip ticket printer 2019-11-02 21:16:59 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer 2019-11-02 21:15:48 +01:00
Laurent Destailleur
ab7c300f43 NEW Can change supplier when cloning a Purchase Order 2019-11-02 20:50:25 +01:00
Frédéric FRANCE
3e2d89dc02
Update ticket.lib.php 2019-11-02 18:16:09 +01:00
Frédéric FRANCE
534f8712a3
Update fournisseurs.php 2019-11-02 18:11:18 +01:00
Frédéric FRANCE
4a564cc05d
Update product.class.php 2019-11-02 18:10:01 +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
Frédéric FRANCE
bdcc33c194
css 2019-11-02 17:36:54 +01:00
Frédéric FRANCE
d51d063423
css 2019-11-02 17:34:27 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
ec9ce1721b Last recent versions of migration at top 2019-11-02 17:18:34 +01:00
Laurent Destailleur
c63db01d5f
Merge branch 'develop' into patch-234 2019-11-02 16:20:24 +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
adf5953693 Doc 2019-11-02 15:27:17 +01:00
Laurent Destailleur
319cb6b4c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 15:20:47 +01:00
Laurent Destailleur
13c42913d9 Trans 2019-11-02 15:20:35 +01:00
Laurent Destailleur
9c5e17d676
Merge pull request #12214 from homer8173/patch-8
Implement new now feature
2019-11-02 15:09:06 +01:00
Laurent Destailleur
93f3b1d2db Clean APIs 2019-11-02 15:05:14 +01:00
Laurent Destailleur
b958997268 Clean code of APIs 2019-11-02 14:49:26 +01:00
Laurent Destailleur
b873541c24 Load foreign key id into lines 2019-11-02 14:32:25 +01:00
Laurent Destailleur
c03fabb789 Clean var 2019-11-02 14:26:27 +01:00
Laurent Destailleur
c9a620d1a6 Renamed property of thirdparty "statut_commercial" into
"status_prospect_label"
2019-11-02 14:25:52 +01:00
Laurent Destailleur
1cc9954f61 Clean api from bad vars 2019-11-02 14:20:43 +01:00
Laurent Destailleur
1b5ca2418b Fix delete of object 2019-11-02 14:08:39 +01:00
Laurent Destailleur
866e42cc1e
Merge pull request #12089 from eoxia-jimmy/develop
Fix Rest API route for NGINX
2019-11-02 14:00:22 +01:00
stickler-ci
03bd6e4db3 Fixing style errors. 2019-11-02 12:51:45 +00:00
Laurent Destailleur
74473edb0c
Update index.php 2019-11-02 13:52:24 +01:00
Laurent Destailleur
3aed55caa6
Merge pull request #12204 from dolibarr95/patch-57
NEW: Reduce the $companystatic calls
2019-11-02 13:46:53 +01:00
Laurent Destailleur
935a7cffa1
Merge pull request #12236 from wdammak/patch-43
Remove limit time for upgrade
2019-11-02 13:45:39 +01:00
Laurent Destailleur
a971943832
Update upgrade2.php 2019-11-02 13:45:27 +01:00
Laurent Destailleur
02ebbf17e9
Merge pull request #12250 from oscim/patch-8
Update modulehelp.php
2019-11-02 13:42:11 +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
8485747713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847 FIX #12281 2019-11-02 13:37:30 +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
137cfe9d4c
Merge pull request #12276 from frederic34/patch-11
css
2019-11-02 13:31:34 +01:00
Laurent Destailleur
6348227698
Merge pull request #12275 from frederic34/patch-8
css
2019-11-02 13:31:18 +01:00
Laurent Destailleur
07e9e2e872
Merge pull request #12274 from frederic34/patch-7
css
2019-11-02 13:31:10 +01:00
Laurent Destailleur
cc51066161
Merge pull request #12273 from frederic34/patch-6
css
2019-11-02 13:30:56 +01:00
Laurent Destailleur
6d9da08407
Merge pull request #12272 from frederic34/patch-5
css
2019-11-02 13:30:47 +01:00
Laurent Destailleur
80fd5af32b
Merge pull request #12271 from frederic34/patch-3
css
2019-11-02 13:30:38 +01:00
stickler-ci
01d8c3bffd Fixing style errors. 2019-11-02 12:20:32 +00:00
wdammak
378d0b0781
Update upgrade2.php 2019-11-02 13:18:48 +01:00
Laurent Destailleur
7fae6d60a7
Merge pull request #12270 from frederic34/patch-2
css
2019-11-02 13:09:38 +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
bd4d7b3505
Merge pull request #12268 from atm-john/develop_fix_fatal_hookmanager
FIX fatal error missing global
2019-11-02 13:07:34 +01:00
Laurent Destailleur
dc18e3efb5
Merge pull request #12278 from andreubisquerra/master
Default customer relative discount in TakePOS
2019-11-02 13:03:43 +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
stickler-ci
6744f10ff2 Fixing style errors. 2019-11-02 11:00:43 +00: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
537f678268
Merge pull request #12285 from frederic34/patch-13
Update define_holiday.php
2019-11-02 11:51:38 +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
7e6732c11b
Merge pull request #12263 from defrance/patch-144
fix: delete function optional and id value
2019-11-02 11:49:04 +01:00
Laurent Destailleur
1797b49778
Merge pull request #12288 from frederic34/patch-14
form_select_status_action returns void
2019-11-02 11:48:07 +01:00
Laurent Destailleur
41a3861465
Merge pull request #12290 from ptibogxiv/patch-273
FIX prices by customer API
2019-11-02 11:47:32 +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
5785cd101a
Merge pull request #12293 from frederic34/patch-18
Update translation.php
2019-11-02 11:41:55 +01:00
Laurent Destailleur
f8afd70f28
Merge pull request #12292 from frederic34/patch-17
FIX $key is overwriting a variable from outer foreach loop
2019-11-02 11:38:54 +01:00
Laurent Destailleur
baba123757
Merge pull request #12301 from grandoc/new_branch_02_11_2019
New branch 02 11 2019
2019-11-02 11:38:03 +01:00
Laurent Destailleur
3943cb18c2
Merge pull request #12295 from frederic34/actioncomm_doxygen
doxygen for actioncomm class
2019-11-02 11:37:30 +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
stickler-ci
dc97a54d82 Fixing style errors. 2019-11-02 09:39:05 +00:00
Philippe GRAND
3ff5389c4e add some comment 2019-11-02 10:35:43 +01:00
Philippe GRAND
8569020e34 add some comment 2019-11-02 10:30:29 +01:00
Laurent Destailleur
82bda63920
Merge pull request #12296 from frederic34/patch-20
Update index.php
2019-11-02 10:09:55 +01:00
Laurent Destailleur
5d3db95dd5
Merge pull request #12297 from frederic34/patch-21
Update index.php
2019-11-02 10:09:27 +01:00
Laurent Destailleur
4fd20157c2
Merge pull request #12298 from frederic34/patch-22
Update propal.class.php
2019-11-02 10:08:33 +01:00
Laurent Destailleur
c078ef991f
Merge pull request #12300 from frederic34/patch-23
doxygen Commande class
2019-11-02 10:08:14 +01:00
Laurent Destailleur
f266e757f5
Merge pull request #12299 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2019-11-02 10:07:55 +01:00
Frédéric FRANCE
385cb1a26c
doxygen Commande class 2019-11-02 09:27:06 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
8c90c80107 Clean code 2019-11-02 01:30:51 +01:00
Scrutinizer Auto-Fixer
50f55cac35 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-02 00:17:45 +00:00
Laurent Destailleur
a14aab5eb1 Fix template 2019-11-02 00:18:50 +01:00
Laurent Destailleur
941043dd67 Fix navigation on resources 2019-11-02 00:17:08 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +01:00
Frédéric FRANCE
7bd88f33a0
Update define_holiday.php 2019-11-01 22:22:07 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
b19593bb8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/card.php
2019-11-01 21:30:19 +01:00
Laurent Destailleur
cf2ee892ee FIX security check. A user can see holiday with link without permissions 2019-11-01 21:27:19 +01:00
Laurent Destailleur
2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/card.php
	htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Laurent Destailleur
4616519dcf FIX Search on leave request ref 2019-11-01 20:52:30 +01:00
Laurent Destailleur
a3a326b25e FIX Search on leave request ref 2019-11-01 20:52:11 +01:00
Laurent Destailleur
83cc9ea643 FIX Search on leave request ref 2019-11-01 20:48:46 +01:00
stickler-ci
0e260c859b Fixing style errors. 2019-11-01 19:28:39 +00:00
Frédéric FRANCE
693506cebd
Update propal.class.php
socid is int
2019-11-01 20:26:55 +01:00
ptibogxiv
6f77885686
Update api_products.class.php 2019-11-01 20:26:39 +01:00
Laurent Destailleur
a95a10b8f0 Update doc 2019-11-01 18:45:44 +01:00
Laurent Destailleur
f74833cfe1 Make modulebuilder more compatible with multicompany 2019-11-01 18:44:32 +01:00
Frédéric FRANCE
40a9326d51
$type is undefined 2019-11-01 18:42:58 +01:00
Laurent Destailleur
012c5ef0c4 Can use substitution variables into filter of fields link 2019-11-01 18:35:48 +01:00
Frédéric FRANCE
433b455376
Update index.php 2019-11-01 18:29:02 +01:00
Frédéric FRANCE
f30c8eb6e8
Update index.php
Fatal error: Uncaught Error: Cannot pass parameter 3 by reference in /home/fred/netlogic/dolibarr/htdocs/mrp/index.php on line 239
2019-11-01 17:54:22 +01:00
Laurent Destailleur
2af23aa658 Enhance modulebuilder 2019-11-01 17:54:17 +01:00
Frédéric FRANCE
d11fc24e3b
Update index.php 2019-11-01 17:46:00 +01:00
Frédéric FRANCE
8b98df296f
Update info.php 2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c
Update index.php 2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde
Update payments.php 2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8
Update list.php 2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5
Update index.php
in class ref and rowid are the same, lib is deprecated and is label
2019-11-01 17:26:53 +01:00
Frédéric FRANCE
bb9b435875
doxygen for actioncomm class 2019-11-01 17:12:07 +01:00
Frédéric FRANCE
e98619745f
Update translation.php 2019-11-01 16:27:30 +01:00
Frédéric FRANCE
12b6e4fae6
Update translation.php
Are you sure the usage of print_barre_liste($title... '', 0, '', '', $limit) is correct as it seems to always return null.
2019-11-01 16:25:22 +01:00
Frédéric FRANCE
ec05e8e2c5
$key is overwriting a variable from outer foreach loop 2019-11-01 16:13:40 +01:00
Laurent Destailleur
a1b2130247 Enhance the progress bar of tasks 2019-11-01 16:09:31 +01:00
Frédéric FRANCE
18b662e430
Update box_graph_orders_permonth.php 2019-11-01 16:01:08 +01:00
Frédéric FRANCE
d14015e3df
Update box_graph_invoices_permonth.php 2019-11-01 15:59:17 +01:00
Frédéric FRANCE
dab8aabb16
Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:58:30 +01:00
Frédéric FRANCE
93b00038f8
Update box_graph_orders_supplier_permonth.php 2019-11-01 15:57:40 +01:00
Frédéric FRANCE
5bdb9da5c5
Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:56:15 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
931f2b809d
Update box_graph_orders_permonth.php 2019-11-01 15:52:13 +01:00
Frédéric FRANCE
44c8cd9d23
give a value by default
The variable $fileurlnb does not seem to be defined for all execution paths
2019-11-01 15:48:55 +01:00
stickler-ci
bc5e6c867f Fixing style errors. 2019-11-01 14:37:21 +00:00
ptibogxiv
0f80ba5353
FIX prices by customer API 2019-11-01 15:36:48 +01:00