Marc de Lima Lucio
|
428efa9227
|
FIX: line edit template: keep fk_parent_line
|
2019-02-05 12:02:49 +01:00 |
|
Marc de Lima Lucio
|
64739098ae
|
FIX: expedition: reset status on rollback + replace hardcoded status with const
|
2019-02-05 11:58:49 +01:00 |
|
Laurent Destailleur
|
dbf7ae4c25
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:58 +01:00 |
|
Laurent Destailleur
|
452dfafd32
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:47 +01:00 |
|
Laurent Destailleur
|
bff2f33022
|
Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch
Fix fetch test
|
2019-02-01 15:56:26 +01:00 |
|
Laurent Destailleur
|
f00271fee6
|
Merge pull request #10467 from atm-gauthier/7.0_fix_nextnumref
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-02-01 15:38:16 +01:00 |
|
gauthier
|
caa937660d
|
FIX : wrong test enabled
|
2019-01-31 12:43:39 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
484b4371c1
|
FIX XSS
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:19:23 +01:00 |
|
Laurent Destailleur
|
231395dab8
|
Merge pull request #10398 from atm-john/fix_trigger
Fix missing trigger
|
2019-01-30 18:53:10 +01:00 |
|
Laurent Destailleur
|
104364ed02
|
Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
|
2019-01-30 15:51:09 +01:00 |
|
gauthier
|
9490929216
|
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
|
2019-01-30 10:49:32 +01:00 |
|
Xebax
|
b24f5fda68
|
FIX Fix PHP warning "count(): Parameter must be an array..."
|
2019-01-29 08:47:46 +01:00 |
|
Laurent Destailleur
|
9d1a02b0d7
|
Fix language
|
2019-01-28 16:25:37 +01:00 |
|
John BOTELLA
|
6f12cdf236
|
Fix travis
|
2019-01-28 11:58:16 +01:00 |
|
John BOTELLA
|
5dbc9ddae0
|
fix travis
|
2019-01-28 11:56:20 +01:00 |
|
John BOTELLA
|
9a666b265f
|
Use an other test
|
2019-01-28 11:53:19 +01:00 |
|
Xebax
|
94d3f038eb
|
FIX 'statut' is ignored when updating a user with the REST API.
|
2019-01-27 13:20:33 +01:00 |
|
John BOTELLA
|
15e1d3b456
|
Fix fetch test
|
2019-01-24 09:40:58 +01:00 |
|
John BOTELLA
|
624d17c96a
|
Fix missing no trigger arg
|
2019-01-23 17:32:49 +01:00 |
|
John BOTELLA
|
1c51716997
|
Fix missing trigger
|
2019-01-23 17:02:20 +01:00 |
|
Laurent Destailleur
|
b868397902
|
Fix colspan
|
2019-01-21 02:27:13 +01:00 |
|
wdammak
|
aaa61254ac
|
Update stats.class.php
Fix div/0 warnings
|
2019-01-19 11:36:09 +01:00 |
|
Laurent Destailleur
|
cb59c97ef7
|
Merge pull request #10350 from a-schild/7.0
Fix for issue #10333 branch 7.0
|
2019-01-17 18:59:52 +01:00 |
|
gauthier
|
d997309bcb
|
FIX : if(!method_exists(dol_loginfunction))
|
2019-01-17 14:49:30 +01:00 |
|
Laurent Destailleur
|
476527e71e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-01-16 16:34:46 +01:00 |
|
Laurent Destailleur
|
6becdc8af4
|
Fix missing substitution of ID
|
2019-01-16 16:34:36 +01:00 |
|
a-schild
|
7e3bfd332e
|
Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
|
2019-01-16 13:07:00 +01:00 |
|
Frédéric FRANCE
|
cf55b54cf5
|
correct list of links
|
2019-01-14 10:02:48 +01:00 |
|
Laurent Destailleur
|
6ca163c68b
|
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
|
2019-01-08 14:06:24 +01:00 |
|
Laurent Destailleur
|
9a6c3ac3df
|
FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER
|
2019-01-08 14:05:07 +01:00 |
|
Marc de Lima Lucio
|
68802c659e
|
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
|
2019-01-08 11:41:58 +01:00 |
|
Laurent Destailleur
|
8e3df45cbf
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/define_holiday.php
|
2019-01-08 01:46:03 +01:00 |
|
Xebax
|
fbb1b344d1
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-01-06 13:44:13 +01:00 |
|
Xebax
|
2c496d2ac0
|
FIX Civility not saved when creating a member.
|
2019-01-06 13:42:41 +01:00 |
|
Juanjo Menent
|
74442911a7
|
Change to 7.0.6
|
2019-01-05 14:45:23 +01:00 |
|
Juanjo Menent
|
7908550937
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-01-05 13:05:50 +01:00 |
|
Ferran Marcet
|
f3dd875fc7
|
FIX: Can't generate invoice pdf
|
2019-01-04 12:00:39 +01:00 |
|
Ferran Marcet
|
4694af0488
|
FIX: Can't generate invoice pdf
|
2019-01-04 11:45:02 +01:00 |
|
Ferran Marcet
|
3e358c90b3
|
Merge branch '7.0up' into 7.0
|
2019-01-04 11:32:19 +01:00 |
|
Ferran Marcet
|
15cc45b8ae
|
FIX: Can't generate invoice pdf
|
2019-01-04 10:52:10 +01:00 |
|
ldestailleur
|
8645a7f524
|
FIX Interface regression for bind people. Fix option
MAIN_OPTIMIZEFORTEXTBROWSER
|
2019-01-02 18:58:45 +01:00 |
|
gauthier
|
fc3da0f5be
|
FIX : holidays get natural_search if search params are set only
|
2019-01-02 10:02:30 +01:00 |
|
Juanjo Menent
|
cf64053fa5
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-29 15:07:09 +01:00 |
|
Regis Houssin
|
09ce84ca93
|
FIX avoid Class 'AdherentType' not found
|
2018-12-21 16:38:02 +01:00 |
|
Laurent Destailleur
|
ed13f7b729
|
Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price
FIX : Function updatePrice with wrong parameters
|
2018-12-19 13:02:00 +01:00 |
|
Laurent Destailleur
|
2978522006
|
Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change
FIX: contact/address tab issue when changing company
|
2018-12-19 12:59:32 +01:00 |
|
Laurent Destailleur
|
fb8c3f01a4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
|
2018-12-18 21:35:30 +01:00 |
|
Laurent Destailleur
|
4b6ae9d424
|
FIX Error reported when creation of thirdparty from member fails
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
|
2018-12-18 21:32:41 +01:00 |
|
Laurent Destailleur
|
b8429c607e
|
FIX Can't create a thirdparty from member if customer code is mandatory.
|
2018-12-18 21:29:53 +01:00 |
|
Laurent Destailleur
|
6851232314
|
Fix removing constant no more required
|
2018-12-18 21:29:36 +01:00 |
|
ATM-Nicolas
|
96144e18f1
|
FIX : Function updatePrice with wrong parameters
|
2018-12-18 15:27:32 +01:00 |
|
Marc de Lima Lucio
|
7e2eca661b
|
FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account
|
2018-12-18 09:40:58 +01:00 |
|
atm-ph
|
1aadcc50f1
|
Fix attached files from user mail form don't work
|
2018-12-17 15:48:27 +01:00 |
|
Juanjo Menent
|
a61677dcc6
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-16 11:31:06 +01:00 |
|
Alexandre SPANGARO
|
6eb9013430
|
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
|
2018-12-16 06:36:55 +01:00 |
|
Laurent Destailleur
|
45115a9590
|
Merge pull request #10191 from fappels/7.0_fix_issue#10186
Fix issue #10186 no display of stock per batch series.
|
2018-12-14 19:34:11 +01:00 |
|
Laurent Destailleur
|
42d4cf9992
|
Fix sql
|
2018-12-10 10:17:54 +01:00 |
|
Juanjo Menent
|
531cfe791d
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-07 11:34:42 +01:00 |
|
fappels
|
e2727f6d91
|
Fix issue #10186 no display of stock per batch series.
|
2018-12-06 21:43:10 +01:00 |
|
Laurent Destailleur
|
779d33cf02
|
Merge pull request #10085 from fmarcet/7.0
FIX Lines are not inserted correctly if VAT have code
|
2018-12-04 13:55:57 +01:00 |
|
Laurent Destailleur
|
b67ed87103
|
Merge pull request #10166 from atm-maxime/fix_pdf_footer
Fix pdf footer height for all documents
|
2018-12-04 13:35:11 +01:00 |
|
Laurent Destailleur
|
347384734d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
|
2018-12-04 13:15:32 +01:00 |
|
Ferran Marcet
|
602986ced8
|
Merge remote-tracking branch 'origin/7.0' into 7.0
# Conflicts:
# htdocs/comm/propal/class/propal.class.php
# htdocs/commande/class/commande.class.php
# htdocs/expensereport/class/expensereport.class.php
# htdocs/fourn/class/fournisseur.commande.class.php
|
2018-12-03 12:33:18 +01:00 |
|
Ferran Marcet
|
7247b14bd9
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 12:28:17 +01:00 |
|
Ferran Marcet
|
135a94dfed
|
Merge branch '7.0up' into 7.0
|
2018-12-03 11:59:46 +01:00 |
|
Ferran Marcet
|
8312d57d16
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 11:58:39 +01:00 |
|
Maxime Kohlhaas
|
8fea6338e1
|
Fix #6565
Fix pdf footer height for all documents
|
2018-12-02 18:51:49 +01:00 |
|
Maxime Kohlhaas
|
42c97cf7d5
|
Fix #6610
|
2018-12-02 17:59:11 +01:00 |
|
Laurent Destailleur
|
07425e4e19
|
Merge pull request #10156 from grandoc/7.0_bug
FIX #3234
|
2018-12-02 17:06:06 +01:00 |
|
Juanjo Menent
|
4b785b22f6
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-02 15:53:14 +01:00 |
|
Philippe GRAND
|
8ec2bac36a
|
FIX #3234
|
2018-12-02 10:02:05 +01:00 |
|
Maxime Kohlhaas
|
5e2f3a53c9
|
Fix expense report in ecm auto dir
|
2018-12-01 19:39:00 +01:00 |
|
Laurent Destailleur
|
a49a083629
|
Merge pull request #10142 from atm-maxime/fix_import_fk_dept
Fix add missing fk_department and fk_pays in contact/bank imports
|
2018-12-01 17:14:27 +01:00 |
|
Laurent Destailleur
|
e30bee50a2
|
Merge pull request #10139 from atm-john/fix_#8741
FIX #8741
|
2018-12-01 17:12:55 +01:00 |
|
Maxime Kohlhaas
|
13806124b2
|
Fix add missing fk_department and fk_pays in contact/bank imports
|
2018-12-01 17:11:04 +01:00 |
|
ATM John BOTELLA
|
474228cbd6
|
FIX #8741
|
2018-12-01 17:01:11 +01:00 |
|
Juanjo Menent
|
642a86ba25
|
Fix #8152
|
2018-12-01 16:55:45 +01:00 |
|
Inovea Conseil
|
18281d9d43
|
FIX #6580
FIX #6580
|
2018-12-01 16:48:50 +01:00 |
|
Maxime Kohlhaas
|
748dd12e4d
|
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model
FIX : Select first mail model by default
|
2018-12-01 16:39:22 +01:00 |
|
Inovea Conseil
|
0ba5fda3da
|
Update price.php
|
2018-12-01 16:11:49 +01:00 |
|
Inovea Conseil
|
8964ec7ea1
|
Fix #9572
Fix #9572
|
2018-12-01 15:58:37 +01:00 |
|
Laurent Destailleur
|
305ab85f5d
|
Merge pull request #10114 from frederic34/patch-17
Update 6.0.0-7.0.0.sql #8723
|
2018-12-01 14:54:31 +01:00 |
|
Juanjo Menent
|
6104d16b08
|
Merge pull request #10117 from atm-maxime/fix_pdf_contract
Fix pdf strato for contract with multipage
|
2018-12-01 11:14:38 +01:00 |
|
Maxime Kohlhaas
|
2b5bf0e2dd
|
Fix pdf strato for contract with multipage
|
2018-12-01 01:07:15 +01:00 |
|
Frédéric FRANCE
|
335327827d
|
Update 6.0.0-7.0.0.sql
|
2018-12-01 00:34:17 +01:00 |
|
Frédéric FRANCE
|
0270da7d8c
|
Update 5.0.0-6.0.0.sql
|
2018-12-01 00:28:58 +01:00 |
|
Frédéric FRANCE
|
6ab12b5911
|
Update llx_paiementfourn.sql
|
2018-12-01 00:26:51 +01:00 |
|
Juanjo Menent
|
d1df592c7e
|
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen
Fix #9074
|
2018-11-30 23:57:49 +01:00 |
|
Juanjo Menent
|
859d6c4401
|
Merge pull request #10109 from atm-maxime/fix_dupl_code
Fix #9070
|
2018-11-30 23:57:32 +01:00 |
|
Maxime Kohlhaas
|
e8a02a971d
|
Fix #9074
|
2018-11-30 23:05:12 +01:00 |
|
Maxime Kohlhaas
|
7585461486
|
Fix #9070
|
2018-11-30 22:16:17 +01:00 |
|
Maxime Kohlhaas
|
5dcb3d2a1f
|
Fix extrafields in import tool
|
2018-11-30 19:23:05 +01:00 |
|
Marc de Lima Lucio
|
c13cc5d697
|
FIX: form actions: select_type_actions could be too small + bad init
|
2018-11-28 15:46:27 +01:00 |
|
Ferran Marcet
|
9d6c95e8a9
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-11-27 11:39:07 +01:00 |
|
Ferran Marcet
|
d8537a3c76
|
FIX Lines are not inserted correctly if VAT have code
|
2018-11-27 11:36:31 +01:00 |
|
fappels
|
322ce410d7
|
Add missing paid field in fetch sql
|
2018-11-23 09:42:43 +01:00 |
|
Laurent Destailleur
|
8535844737
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-19 18:27:00 +01:00 |
|
Laurent Destailleur
|
bd8856b988
|
Merge pull request #10033 from frederic34/patch-9
Update CMailFile.class.php
|
2018-11-19 18:20:20 +01:00 |
|
Laurent Destailleur
|
7a3f088fcb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-19 18:19:11 +01:00 |
|
Laurent Destailleur
|
77bc1c4313
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2018-11-19 18:18:43 +01:00 |
|
gauthier
|
ecdfa5219b
|
FIX : We want to be able to send PDF of paid invoices
|
2018-11-19 17:31:45 +01:00 |
|
florian HENRY
|
dc2f1e9812
|
fix list agenda extrafield visibility
|
2018-11-19 11:25:48 +01:00 |
|
Frédéric FRANCE
|
30b1db34cd
|
Update CMailFile.class.php
|
2018-11-17 11:33:01 +01:00 |
|
Laurent Destailleur
|
f2bbb54b8f
|
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
FIX : filter on product category doesn't work
|
2018-11-15 16:44:40 +01:00 |
|
gauthier
|
85dd0ec2dd
|
FIX : filter on product category doesn't work
|
2018-11-13 15:24:53 +01:00 |
|
gauthier
|
f404cae546
|
FIX : Same on customer card
|
2018-11-12 16:04:42 +01:00 |
|
gauthier
|
66ea8bbe87
|
FIX : fourn payment modes musn't be available on customer docs
|
2018-11-12 15:58:41 +01:00 |
|
tarrsalah
|
5eb897e049
|
FIX sql query performance on list_qualified_avoir_supplier_invoices.
|
2018-11-12 12:11:40 +01:00 |
|
Laurent Destailleur
|
400b48bd9b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:59 +01:00 |
|
Laurent Destailleur
|
9012f6ecc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:40 +01:00 |
|
Laurent Destailleur
|
f919e6ddb0
|
Merge pull request #9971 from atm-gauthier/FIX_langs_projet
FIX : OppStatusShort doesn't exists
|
2018-11-08 20:00:49 +01:00 |
|
Laurent Destailleur
|
e84e7f02c8
|
Merge pull request #9963 from atm-john/fix_marge_sign
FIX marge sign
|
2018-11-08 19:37:52 +01:00 |
|
Laurent Destailleur
|
78778e4c58
|
Merge pull request #9948 from frederic34/patch-9
FIX mode is only customer in stats fichinter
|
2018-11-08 19:16:00 +01:00 |
|
Laurent Destailleur
|
e92a63ba73
|
FIX If we change customer/supplier rule we can't edit old thirdparty.
|
2018-11-08 17:15:35 +01:00 |
|
Frédéric FRANCE
|
8bb1545ed0
|
Update index.php
|
2018-11-08 12:16:05 +01:00 |
|
Frédéric FRANCE
|
670eed1e68
|
Update index.php
|
2018-11-08 12:13:07 +01:00 |
|
gauthier
|
70826c3191
|
FIX : same on lines
|
2018-11-07 16:32:23 +01:00 |
|
gauthier
|
05a679a10c
|
FIX : OppStatusShort doesn't exists
|
2018-11-07 16:26:25 +01:00 |
|
John BOTELLA
|
9d780a1722
|
Fix sign
|
2018-11-07 10:11:29 +01:00 |
|
Laurent Destailleur
|
56a70ab4e5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-05 10:23:15 +01:00 |
|
Laurent Destailleur
|
693cf72fca
|
Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access
FIX: task time screen: bad task assignments
|
2018-11-05 10:21:28 +01:00 |
|
Laurent Destailleur
|
e1e0001fda
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-05 09:56:00 +01:00 |
|
Laurent Destailleur
|
8b373fb7a3
|
Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent
Fix parent link was not removed on societe deletion #9106
|
2018-11-05 09:35:41 +01:00 |
|
Laurent Destailleur
|
98a3af620b
|
FIX #9934
|
2018-11-05 09:26:23 +01:00 |
|
Frédéric FRANCE
|
d6b909a280
|
Update index.php
|
2018-11-03 18:26:11 +01:00 |
|
Frédéric FRANCE
|
8ab53012b7
|
mode is only customer in stats fichinter
|
2018-11-03 18:20:36 +01:00 |
|
Maxime Kohlhaas
|
29c0448a2e
|
Fix parent link was not removed on societe deletion #9106
|
2018-11-01 15:41:58 +01:00 |
|
Maxime Kohlhaas
|
d1133916e0
|
Fix tracking field in dictionnary should not be mandatory
|
2018-11-01 15:33:14 +01:00 |
|
Laurent Destailleur
|
4b402aa6d1
|
Fix regression on name of array
|
2018-10-31 15:41:00 +01:00 |
|
Laurent Destailleur
|
07719eaf1e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-10-31 15:31:44 +01:00 |
|
Laurent Destailleur
|
ca726e6c94
|
FIX Error generating ODT when option to use contact on doc on
|
2018-10-31 15:31:22 +01:00 |
|
Laurent Destailleur
|
064417dcf1
|
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2
Fix invoice creation from contract was invoicing closed services #9087
|
2018-10-30 21:13:38 +01:00 |
|
Marc de Lima Lucio
|
2fbc305683
|
FIX: task time screen: last fix was overkill
|
2018-10-30 16:00:56 +01:00 |
|
Laurent Destailleur
|
68804cf8a5
|
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
FIX missing name alias field in societe import/export #9091
|
2018-10-30 15:00:34 +01:00 |
|
Laurent Destailleur
|
b0ef8680ff
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-10-30 14:28:25 +01:00 |
|
Marc de Lima Lucio
|
8911d72be8
|
FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do
|
2018-10-30 12:28:04 +01:00 |
|
Frédéric FRANCE
|
a30091fd74
|
Update commande.class.php
|
2018-10-27 09:51:19 +02:00 |
|
Maxime Kohlhaas
|
abb343d37e
|
Fix missing name alias field in societe import/export #9091
|
2018-10-27 09:42:08 +02:00 |
|
Maxime Kohlhaas
|
1b054f1b36
|
Fix invoice creation from contract was invoicing closed services #9087
|
2018-10-27 09:21:49 +02:00 |
|
Marc de Lima Lucio
|
16c35035c1
|
FIX: pdf typhon: order reference duplicate
|
2018-10-25 12:07:40 +02:00 |
|
gauthier
|
036f70860e
|
FIX : wrong occurence number of contract on contact card, we must only count externals
|
2018-10-24 10:17:21 +02:00 |
|
Laurent Destailleur
|
919c4fc5bc
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/theme/md/style.css.php
|
2018-10-24 02:40:57 +02:00 |
|
Laurent Destailleur
|
4060dd5377
|
Merge pull request #9826 from frederic34/patch-9
Update ajax.lib.php
|
2018-10-24 02:29:20 +02:00 |
|
Laurent Destailleur
|
52364f0fd9
|
Merge pull request #9834 from frederic34/patch-19
missing semicolon in MD style css
|
2018-10-24 02:29:02 +02:00 |
|
Laurent Destailleur
|
2ba6f96765
|
Update style.css.php
|
2018-10-24 02:27:59 +02:00 |
|
Laurent Destailleur
|
ddd267f4c3
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-10-24 02:21:53 +02:00 |
|
ATM-Nicolas
|
cf28e4e442
|
FIX : Variable name
|
2018-10-22 15:19:33 +02:00 |
|
Frédéric FRANCE
|
83e2951107
|
Update style.css.php
|
2018-10-21 09:59:14 +02:00 |
|
Frédéric FRANCE
|
28c86a613d
|
Update style.css.php
|
2018-10-21 09:39:07 +02:00 |
|