Frédéric FRANCE
|
aecac3632f
|
wip
|
2019-02-10 11:08:48 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Laurent Destailleur
|
f333fb3b7d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 14:59:07 +01:00 |
|
Laurent Destailleur
|
8412a91576
|
Fix do not send email if approval error
|
2019-02-08 14:58:46 +01:00 |
|
Laurent Destailleur
|
7f9d995c9c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-02-08 14:54:31 +01:00 |
|
Laurent Destailleur
|
2e1201b7b0
|
FIX Transaction on leave approval and decrease ko if setup not complete
|
2019-02-08 14:47:03 +01:00 |
|
Laurent Destailleur
|
ed733fb82d
|
Fix phpcs
|
2019-02-08 13:28:10 +01:00 |
|
Laurent Destailleur
|
766ef36ea3
|
Standardize code of page of leave movements
|
2019-02-08 13:26:59 +01:00 |
|
Laurent Destailleur
|
8760b1e592
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 12:57:50 +01:00 |
|
Laurent Destailleur
|
27da574e38
|
Fix phpcs
|
2019-02-08 12:36:33 +01:00 |
|
Laurent Destailleur
|
a40d4ddbaa
|
Fix phpcs
|
2019-02-08 12:23:04 +01:00 |
|
Laurent Destailleur
|
1611c613f5
|
Fix phpcs
|
2019-02-08 12:19:51 +01:00 |
|
Laurent Destailleur
|
5043aa7b35
|
Fix regression for icon of external menus
|
2019-02-08 12:17:11 +01:00 |
|
Laurent Destailleur
|
78fbeeaa62
|
Fix syntax error
|
2019-02-08 11:57:39 +01:00 |
|
Laurent Destailleur
|
b3f955e9a5
|
Fix syntax error
|
2019-02-08 11:55:27 +01:00 |
|
Laurent Destailleur
|
ec686a8f79
|
Fix phpcs
|
2019-02-08 11:30:20 +01:00 |
|
Laurent Destailleur
|
512ceae70a
|
Fix phpcs
|
2019-02-08 11:27:30 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
e81a2548d8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 11:17:14 +01:00 |
|
Laurent Destailleur
|
14a48b2c95
|
Fix phpcs
|
2019-02-08 11:17:04 +01:00 |
|
Laurent Destailleur
|
7cc0607e28
|
Merge pull request #10528 from laudeco/feature/9429_top_menu_icons
#9429 - use font awesome for the top menu icons
|
2019-02-08 11:15:34 +01:00 |
|
Laurent Destailleur
|
9b2a91893d
|
Update doc
|
2019-02-08 10:49:02 +01:00 |
|
Laurent Destailleur
|
662ed9fba7
|
Prepare 9.0.1
|
2019-02-08 10:47:25 +01:00 |
|
Laurent Destailleur
|
fe1188c4ea
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/filefunc.inc.php
|
2019-02-08 10:44:45 +01:00 |
|
Laurent Destailleur
|
3a5fc8f0c3
|
NEW Add protection to avoid packaging if files non indexed exists into
dir.
|
2019-02-08 10:41:11 +01:00 |
|
Laurent Destailleur
|
2686062031
|
Prepare version 9.0.1
|
2019-02-08 10:30:07 +01:00 |
|
Laurent Destailleur
|
43fbcf7081
|
Prepare 8.0.5
|
2019-02-08 10:28:59 +01:00 |
|
Laurent Destailleur
|
1c129a78ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-08 10:22:55 +01:00 |
|
Laurent Destailleur
|
679a13e48c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/expedition/class/expedition.class.php
|
2019-02-08 10:22:36 +01:00 |
|
Laurent Destailleur
|
fbd2d368e4
|
Update style.css.php
|
2019-02-08 10:19:59 +01:00 |
|
Laurent Destailleur
|
8143acbadf
|
Merge branch 'develop' into feature/9429_top_menu_icons
|
2019-02-08 10:15:09 +01:00 |
|
Laurent Destailleur
|
3318baa664
|
Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table
Fix display payment table on multiple pages
|
2019-02-08 10:08:46 +01:00 |
|
Laurent Destailleur
|
3d58e93a3c
|
Merge pull request #10525 from atm-greg/8.0_FIX_supplier_proposal_lines_added_without_unit
FIX add fk_unit on addline action
|
2019-02-08 10:01:29 +01:00 |
|
Laurent Destailleur
|
aa574c2a47
|
Merge pull request #10517 from frederic34/patch-18
fix phpcs
|
2019-02-08 09:56:50 +01:00 |
|
Laurent Destailleur
|
7334f02e5c
|
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
Dev defautselectcustomertype
|
2019-02-08 09:56:29 +01:00 |
|
Laurent Destailleur
|
81507ea43e
|
Merge pull request #10510 from frederic34/patch-2
fix phpcs public/payment/newpayment.php
|
2019-02-08 09:53:23 +01:00 |
|
Laurent Destailleur
|
4997b5968f
|
Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
|
2019-02-08 09:52:21 +01:00 |
|
Laurent Destailleur
|
714516fc18
|
Merge pull request #10509 from OPEN-DSI/fix-margin-agents
Fix margin by users when a thirdparty have many sellers
|
2019-02-08 09:51:26 +01:00 |
|
Laurent Destailleur
|
3f01cd554b
|
Update agentMargins.php
|
2019-02-08 09:50:45 +01:00 |
|
Laurent Destailleur
|
76b021d061
|
Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
|
2019-02-08 09:46:14 +01:00 |
|
Laurent Destailleur
|
92ef0d75cf
|
Merge pull request #10504 from atm-quentin/FIX_supplier_invoice_paiement_credit_deposit
FIX supplier invoice payment total doesnnt care about deposit or credit
|
2019-02-08 09:44:42 +01:00 |
|
Laurent Destailleur
|
ccda5719cf
|
Merge pull request #10503 from atm-quentin/FIX_product_stat_supplier_invoice
FIX supplier invoice product stats total ht is line total not invoice…
|
2019-02-08 09:43:38 +01:00 |
|
Laurent Destailleur
|
70135a1940
|
Merge pull request #10493 from grandoc/new_branch_04_02_2019
update with html5 compliant code
|
2019-02-08 09:42:29 +01:00 |
|
Laurent Destailleur
|
0e42e8824b
|
Merge branch 'develop' into new_branch_04_02_2019
|
2019-02-08 09:42:18 +01:00 |
|
Laurent Destailleur
|
471f11dace
|
Merge pull request #10502 from hregis/9.0_merge
FIX wrong merged conflict
|
2019-02-08 09:34:49 +01:00 |
|
Laurent Destailleur
|
8abebb091c
|
Var no more used
|
2019-02-08 09:33:01 +01:00 |
|
Laurent Destailleur
|
24955088de
|
Merge pull request #10501 from hregis/8.0_mc
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
|
2019-02-08 09:31:26 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
e5d7a862b4
|
Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent
Fix psql search insensitive accent
|
2019-02-08 09:29:59 +01:00 |
|