Philippe GRAND
|
0d5726b70a
|
update with html5 compliant code
|
2019-02-10 16:08:03 +01:00 |
|
Frédéric FRANCE
|
ba32c3b782
|
first parameter of print_liste_field_titre was translated
|
2019-02-10 16:06:07 +01:00 |
|
Philippe GRAND
|
5d6ebad557
|
update with html5 compliant code
|
2019-02-10 16:05:06 +01:00 |
|
Philippe GRAND
|
9670228f06
|
update with html5 compliant code
|
2019-02-10 16:00:59 +01:00 |
|
Philippe GRAND
|
d42ef14a92
|
update with html5 compliant code
|
2019-02-10 15:59:19 +01:00 |
|
Frédéric FRANCE
|
af3adcecb0
|
first parameter of print_liste_field_titre was translated
|
2019-02-10 15:48:53 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
aecac3632f
|
wip
|
2019-02-10 11:08:48 +01:00 |
|
Philippe GRAND
|
20c0af1f57
|
update with html5 compliant code
|
2019-02-10 11:04:09 +01:00 |
|
Philippe GRAND
|
1b25d284a2
|
update with html5 compliant code
|
2019-02-10 11:01:23 +01:00 |
|
Philippe GRAND
|
89351e6027
|
update with html5 compliant code
|
2019-02-10 10:56:34 +01:00 |
|
Philippe GRAND
|
e7f2b92eca
|
update with html5 compliant code
|
2019-02-10 10:49:42 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Philippe GRAND
|
2624865632
|
update with html5 compliant code
|
2019-02-10 10:38:50 +01:00 |
|
Philippe GRAND
|
83b95ae6cc
|
update with html5 compliant code
|
2019-02-10 10:25:20 +01:00 |
|
Philippe GRAND
|
19885cb465
|
update with html5 compliant code
|
2019-02-10 10:23:37 +01:00 |
|
Philippe GRAND
|
673e09d7c2
|
update with html5 compliant code
|
2019-02-10 10:21:54 +01:00 |
|
Philippe GRAND
|
508d6345a1
|
update with html5 compliant code
|
2019-02-10 10:16:58 +01:00 |
|
Philippe GRAND
|
c071e488cf
|
update with html5 compliant code
|
2019-02-10 10:10:41 +01:00 |
|
Laurent Destailleur
|
7d20321b3b
|
Fix trans
|
2019-02-09 19:24:52 +01:00 |
|
Laurent Destailleur
|
0839b39c52
|
Fix translation
|
2019-02-09 19:15:36 +01:00 |
|
Laurent Destailleur
|
d38ead798a
|
Trans
|
2019-02-09 19:12:24 +01:00 |
|
Laurent Destailleur
|
c77d328f12
|
Fix translation
|
2019-02-09 19:05:15 +01:00 |
|
Frédéric FRANCE
|
2020e199b2
|
Update paiement.php
|
2019-02-09 16:35:10 +01:00 |
|
Frédéric FRANCE
|
529354718b
|
replace html align by class in boxes
|
2019-02-09 15:24:21 +01:00 |
|
Laurent Destailleur
|
2d4ccec309
|
Fix document generation of modulebuilder
|
2019-02-09 14:12:36 +01:00 |
|
Laurent Destailleur
|
7f4bbcf9a5
|
Some minor fix in default values and modulebuilder
|
2019-02-09 13:40:22 +01:00 |
|
Laurent Destailleur
|
522afd8e7b
|
Fix font awesome 5
|
2019-02-09 13:11:02 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Philippe Grand
|
92ec149fb6
|
Update modules_fichinter.php
|
2019-02-09 11:05:52 +01:00 |
|
Philippe GRAND
|
869f59de96
|
language internationalization
|
2019-02-09 10:56:59 +01:00 |
|
Laurent Destailleur
|
5483856543
|
Fix phpcs
|
2019-02-08 23:53:40 +01:00 |
|
Laurent Destailleur
|
7625eb7cd4
|
Fix missing error management after afterPDFCreation hook.
Removed dead code
|
2019-02-08 19:54:24 +01:00 |
|
Laurent Destailleur
|
e2934a6b5f
|
Error message returned by old non "addreplace" hooks is propagated too
|
2019-02-08 19:38:52 +01:00 |
|
Laurent Destailleur
|
a916708068
|
Fix missing disable dependency
|
2019-02-08 19:01:47 +01:00 |
|
Laurent Destailleur
|
d6628a87a9
|
Fix phpcs
|
2019-02-08 17:48:24 +01:00 |
|
atm-quentin
|
300438b290
|
FIX on chrome you can send multiple form if you click more than once on button
|
2019-02-08 15:57:08 +01:00 |
|
Lionel VESSILLER
|
70dfecaa0b
|
Fix calcul margin by seller and parameters send (filters)
|
2019-02-08 15:48:43 +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 |
|
Maxime Kohlhaas
|
da361f0ea5
|
Fix wrong column name in purchase journal
|
2019-02-08 12:24:07 +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 |
|
Frédéric FRANCE
|
f548a0ed79
|
desactivate button on click to avoid multiple clicks
|
2019-02-08 11:01:47 +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
|
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
|
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
|
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 |
|
Laurent Destailleur
|
bd3f0da19c
|
Merge pull request #10515 from atm-gauthier/8.0_fix_can_addline_on_invoices
FIX : can't add lines on invoices
|
2019-02-08 09:27:51 +01:00 |
|
Laurent De Coninck
|
48eba7c71b
|
use font awesome for the top menu icons
|
2019-02-08 08:41:26 +01:00 |
|
Laurent Destailleur
|
3bdf017d41
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:59 +01:00 |
|
Laurent Destailleur
|
8d82135033
|
Fix missing \n
|
2019-02-07 19:39:23 +01:00 |
|
Laurent Destailleur
|
491bfbdbfc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:04 +01:00 |
|
Laurent Destailleur
|
89af7b0e98
|
Add doctype to web site
|
2019-02-07 19:38:36 +01:00 |
|
atm-ph
|
51515a487e
|
Fix search unaccent from left menu search box
|
2019-02-07 17:58:25 +01:00 |
|
atm-ph
|
ec7ef265b7
|
Fix psql search insensitive accent
|
2019-02-07 17:47:17 +01:00 |
|
atm-greg
|
9d0e0c2798
|
FIX add fk_unit on addline action
|
2019-02-07 15:17:52 +01:00 |
|
Laurent Destailleur
|
0156cd40a6
|
Fix name
|
2019-02-07 14:00:32 +01:00 |
|
Laurent Destailleur
|
065e74379b
|
Missing picto
|
2019-02-07 13:54:38 +01:00 |
|
Laurent Destailleur
|
2ef8544a39
|
sort and filter on parent company
|
2019-02-07 13:52:51 +01:00 |
|
Laurent Destailleur
|
6a4a92510d
|
Code comment
|
2019-02-07 13:32:05 +01:00 |
|
atm-ph
|
8e6a567b09
|
Fix display payment table on multiple pages
|
2019-02-07 12:36:22 +01:00 |
|
florian HENRY
|
bc74cd5066
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_defautselectcustomertype
|
2019-02-07 12:21:45 +01:00 |
|
florian HENRY
|
6ee5a9e2a6
|
fix travis
|
2019-02-07 12:21:33 +01:00 |
|
Alexandre SPANGARO
|
2ba8ae00e4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-02-06 21:56:01 +01:00 |
|
Alexandre SPANGARO
|
a28c926f03
|
Fix
|
2019-02-06 21:43:16 +01:00 |
|
Laurent Destailleur
|
5516cb061d
|
Fix filter
|
2019-02-06 18:50:34 +01:00 |
|
Laurent Destailleur
|
d960159b73
|
NEW Column of parent company is available in list of third parties
|
2019-02-06 18:49:58 +01:00 |
|
Frédéric FRANCE
|
c0686733e8
|
fix phpcs
|
2019-02-06 15:56:13 +01:00 |
|
gauthier
|
29e4fce450
|
FIX : can't add lines on invoices
|
2019-02-06 12:35:23 +01:00 |
|
florian HENRY
|
f0f0b69d87
|
add comment
|
2019-02-06 10:59:24 +01:00 |
|
florian HENRY
|
3f6187fe12
|
remove useless parameters
|
2019-02-06 10:58:40 +01:00 |
|
florian HENRY
|
813a7a0085
|
remove comment
|
2019-02-06 10:57:11 +01:00 |
|
florian HENRY
|
3f20cae6d3
|
NEW: setup default thridparty type (customer or prospect/customer)
|
2019-02-06 10:54:11 +01:00 |
|
Lionel VESSILLER
|
b87df18292
|
Fix the margin rate by seller when the margin is negative
|
2019-02-06 09:37:19 +01:00 |
|
florian HENRY
|
95cc9faf7e
|
fix php warning
|
2019-02-06 09:01:24 +01:00 |
|
Laurent Destailleur
|
58eaee2acf
|
Fix css
|
2019-02-06 00:56:28 +01:00 |
|
Laurent Destailleur
|
9e28db4202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
|
2019-02-06 00:51:10 +01:00 |
|
Laurent Destailleur
|
88fb491441
|
Fix note output
|
2019-02-06 00:40:07 +01:00 |
|
Laurent Destailleur
|
58e6cfd635
|
Fix popup content
|
2019-02-06 00:36:11 +01:00 |
|
Frédéric FRANCE
|
7c82b416ae
|
fix phpcs public/payment/newpayment.php
|
2019-02-05 20:56:34 +01:00 |
|
Laurent Destailleur
|
ce5717a7b7
|
FIX Default language of company is not set
|
2019-02-05 20:43:26 +01:00 |
|
Laurent Destailleur
|
82df83cec2
|
Add log
|
2019-02-05 20:04:25 +01:00 |
|
Laurent Destailleur
|
27f804a454
|
Fix currency
|
2019-02-05 19:59:36 +01:00 |
|
Laurent Destailleur
|
d4e6610722
|
Fix currency
|
2019-02-05 19:58:42 +01:00 |
|
Laurent Destailleur
|
5a659bfd90
|
Fix Missing currency
|
2019-02-05 19:57:35 +01:00 |
|
Laurent Destailleur
|
7c24847fa3
|
Typo
|
2019-02-05 19:38:28 +01:00 |
|
Laurent Destailleur
|
7436a3bc73
|
Typo
|
2019-02-05 19:37:58 +01:00 |
|
Laurent Destailleur
|
66998c4873
|
Fix translation
|
2019-02-05 19:37:22 +01:00 |
|
Laurent Destailleur
|
44f5223c90
|
Remove warning
|
2019-02-05 18:54:38 +01:00 |
|
Lionel VESSILLER
|
727213a5fd
|
Fix margin by users when a thirdparty have many sellers
|
2019-02-05 17:04:46 +01:00 |
|
Laurent Destailleur
|
0345c00f0a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 16:45:10 +01:00 |
|
Laurent Destailleur
|
bb315a6f12
|
Fix trans
|
2019-02-05 16:44:10 +01:00 |
|
Laurent Destailleur
|
f4e4377435
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:24:14 +01:00 |
|
Laurent Destailleur
|
4097d648ae
|
Fix search with alias
|
2019-02-05 15:23:51 +01:00 |
|
Laurent Destailleur
|
d49dd8d593
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:16:44 +01:00 |
|
Laurent Destailleur
|
b7f2a2b3f3
|
Fix search alias page if page not found
|
2019-02-05 15:15:41 +01:00 |
|
Laurent Destailleur
|
fbed22050d
|
fix syntax error
|
2019-02-05 14:33:36 +01:00 |
|
Laurent Destailleur
|
4de122d1d4
|
Fix date format
|
2019-02-05 14:33:03 +01:00 |
|
Laurent Destailleur
|
e3d0cb1637
|
Fix css
|
2019-02-05 14:32:23 +01:00 |
|
Laurent Destailleur
|
541f6e537e
|
Fix link to pay membership renewal
|
2019-02-05 14:05:39 +01:00 |
|
Laurent Destailleur
|
e5827f77cb
|
Fix link to pay membership renewal
|
2019-02-05 14:03:35 +01:00 |
|
Laurent Destailleur
|
6d09c85231
|
Fix missing button
|
2019-02-05 14:01:32 +01:00 |
|
Laurent Destailleur
|
b58c49d0bb
|
Trans
|
2019-02-05 13:59:23 +01:00 |
|
Laurent Destailleur
|
8d40440418
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-05 13:57:08 +01:00 |
|
Laurent Destailleur
|
d6501d996c
|
Missing trans
|
2019-02-05 13:56:55 +01:00 |
|
Laurent Destailleur
|
789c089e14
|
Code comment
|
2019-02-05 13:08:28 +01:00 |
|
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 |
|
atm-quentin
|
da0c863f45
|
FIX supplier invoice payment total dont care about deposit or credit
|
2019-02-05 10:30:38 +01:00 |
|
atm-quentin
|
730a2a90ff
|
FIX supplier invoice product stats total ht is line total not invoice total
|
2019-02-05 09:43:14 +01:00 |
|
Regis Houssin
|
8860eab6b1
|
FIX wrong merged conflict
|
2019-02-05 07:40:50 +01:00 |
|
Regis Houssin
|
4a19cba257
|
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
|
2019-02-05 06:34:05 +01:00 |
|
Laurent Destailleur
|
bb8b3d4e5c
|
Add br
|
2019-02-05 00:25:42 +01:00 |
|
wdammak
|
f1ffae3ac5
|
Update main.inc.php
fix travis
|
2019-02-04 18:27:47 +01:00 |
|
wdammak
|
01ba32efbc
|
Update main.inc.php
Set current modulepart
|
2019-02-04 17:52:15 +01:00 |
|
Philippe GRAND
|
6b9b17f93e
|
update with html5 compliant code
|
2019-02-04 13:57:38 +01:00 |
|
Philippe GRAND
|
a14332b2b0
|
update with html5 compliant code
|
2019-02-04 13:51:39 +01:00 |
|
Philippe GRAND
|
28a2135409
|
update with html5 compliant code
|
2019-02-04 13:45:50 +01:00 |
|
Philippe GRAND
|
386a4102b7
|
update with html5 compliant code
|
2019-02-04 13:44:02 +01:00 |
|
Philippe GRAND
|
b7605e233e
|
update with html5 compliant code
|
2019-02-04 13:40:00 +01:00 |
|
Philippe GRAND
|
71e99e0972
|
update with html5 compliant code
|
2019-02-04 10:42:40 +01:00 |
|
Philippe GRAND
|
577aef54e1
|
update with html5 compliant code
|
2019-02-04 10:37:51 +01:00 |
|
Philippe GRAND
|
1154f9a048
|
update with html5 compliant code
|
2019-02-04 10:35:53 +01:00 |
|
Philippe GRAND
|
eb25d12a1b
|
update with html5 compliant code
|
2019-02-04 10:32:33 +01:00 |
|
Philippe GRAND
|
7c8d84aa03
|
update with html5 compliant code
|
2019-02-04 10:27:26 +01:00 |
|
Laurent Destailleur
|
3babc11312
|
Fix phpcs
|
2019-02-04 02:06:32 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
48ab519841
|
Fix typo
|
2019-02-03 21:40:56 +01:00 |
|
Laurent Destailleur
|
5a6e46a9c3
|
Doc
|
2019-02-03 21:40:23 +01:00 |
|
Laurent Destailleur
|
695a681c14
|
NEW Can generate invoices from timespent of a project
|
2019-02-03 21:35:30 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
efe5cd3dd8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 21:13:06 +01:00 |
|
Laurent Destailleur
|
cdfeeafab9
|
FIX #10381
|
2019-02-03 21:12:05 +01:00 |
|
Laurent Destailleur
|
410b291ad8
|
Fix quote not closed
|
2019-02-03 20:52:39 +01:00 |
|
Laurent Destailleur
|
af9e2d07d2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
|
2019-02-03 20:38:47 +01:00 |
|
Laurent Destailleur
|
4b77b3ff23
|
NEW Support tag {ccc} on payment ref
|
2019-02-03 20:36:20 +01:00 |
|
Laurent Destailleur
|
72f78ecf3b
|
FIX #10460 compatibility with MariaDB 10.4
|
2019-02-03 20:02:05 +01:00 |
|
Laurent Destailleur
|
a520642d97
|
FIX Price in combo list of service does not use the correct price level
|
2019-02-03 19:54:55 +01:00 |
|
Laurent Destailleur
|
4d41b1b33c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 19:45:45 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
4538d13add
|
Merge pull request #10450 from atm-gauthier/8.0_fIX_fetch_member
FIX : wrong tests on fetch
|
2019-02-03 19:25:25 +01:00 |
|
Laurent Destailleur
|
bd2c7092a4
|
Update user.class.php
|
2019-02-03 19:25:11 +01:00 |
|
Laurent Destailleur
|
62d677118d
|
Update adherent.class.php
|
2019-02-03 19:24:18 +01:00 |
|
Laurent Destailleur
|
3a5372b59c
|
Merge pull request #10484 from andreubisquerra/master
CSS improvements and Takepos setup check
|
2019-02-03 19:16:08 +01:00 |
|
Laurent Destailleur
|
8dd64b0dc1
|
Update takepos.php
|
2019-02-03 19:15:41 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
49d695c9b2
|
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
|
2019-02-03 19:06:38 +01:00 |
|
Frédéric FRANCE
|
9c41f41c24
|
add missing require date.lib.php
|
2019-02-03 19:06:20 +01:00 |
|
Laurent Destailleur
|
23866e0722
|
Merge pull request #10482 from frederic34/patch-17
FIX add missing require date.lib.php
|
2019-02-03 19:05:57 +01:00 |
|
Laurent Destailleur
|
326996d392
|
Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound
psr2 end file new line none found
|
2019-02-03 19:04:28 +01:00 |
|
Laurent Destailleur
|
aa821634ec
|
Merge pull request #10489 from frederic34/patch-18
$this->get($id) return array not int
|
2019-02-03 19:03:42 +01:00 |
|
Laurent Destailleur
|
f8b10e9c3d
|
Doxygen
|
2019-02-03 18:47:55 +01:00 |
|
Laurent Destailleur
|
afd53a99c2
|
Fix merge
|
2019-02-03 18:21:03 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Laurent Destailleur
|
456e78b7cf
|
FIX #10485
|
2019-02-03 17:45:31 +01:00 |
|
Frédéric FRANCE
|
e3a5d2b839
|
get return array not int
|
2019-02-03 16:39:48 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
andreubisquerra
|
8b1b8bb7a3
|
CSS improvements and Takepos setup check
|
2019-02-02 23:57:38 +01:00 |
|
Maxime Kohlhaas
|
bb3225809b
|
Fix warehouse fetch was not checking parameters. Fixes #10414
|
2019-02-02 18:43:25 +01:00 |
|
Frédéric FRANCE
|
a5af92cff1
|
add missing require date.lib.php
|
2019-02-02 18:33:48 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
80b48680f6
|
clean missing spaces in the last merge
|
2019-02-02 09:49:07 +01:00 |
|
Frédéric FRANCE
|
2f40443b46
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 09:46:14 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
bd8d81a96e
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 07:49:41 +01:00 |
|
Laurent Destailleur
|
75845a990f
|
FIX Missing province in export of invoice
|
2019-02-01 22:55:28 +01:00 |
|
Laurent Destailleur
|
28c1b1ce58
|
Work on billing time spent
|
2019-02-01 22:39:36 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Laurent Destailleur
|
2e5382f40d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:39:27 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
c313ad6195
|
Fix phpcs
|
2019-02-01 18:19:39 +01:00 |
|
Laurent Destailleur
|
044e617667
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:09 +01:00 |
|
Laurent Destailleur
|
9d03f4b228
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:02 +01:00 |
|
Laurent Destailleur
|
a2ab6348ed
|
Fix bad menu leading on a development page
|
2019-02-01 17:06:34 +01:00 |
|
Laurent Destailleur
|
b83ff06db8
|
FIX #10416 No need of another option
|
2019-02-01 17:00:04 +01:00 |
|
Laurent Destailleur
|
08050434a1
|
Merge pull request #10435 from wdammak/patch-22
Wrapping for stock movements
|
2019-02-01 16:11:37 +01:00 |
|
Laurent Destailleur
|
3fc49a9de2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 16:07:27 +01:00 |
|
Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
e366ab551c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-01 16:01:26 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +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
|
affdc08848
|
Merge branch 'develop' into new_branch_30_01_2019
|
2019-02-01 15:54:36 +01:00 |
|
Laurent Destailleur
|
b9dc803911
|
Merge pull request #10432 from grandoc/new_branch_27_01_2019
update with html5 compliant code
|
2019-02-01 15:50:49 +01:00 |
|
Alexandre SPANGARO
|
13cf3b1d7f
|
Add subledger in various payment
|
2019-02-01 15:50:12 +01:00 |
|
Laurent Destailleur
|
0ed74ee8de
|
Merge pull request #10476 from fappels/10_work_on_supplier_price_history
Fix travis
|
2019-02-01 15:46:29 +01:00 |
|
Laurent Destailleur
|
dbab955cbd
|
Merge pull request #10471 from mapiolca/patch-9
#Fix : Error in Total Products/Services
|
2019-02-01 15:43:47 +01:00 |
|
Laurent Destailleur
|
62e9c3fb09
|
Merge pull request #10475 from fappels/10_work_on_supplier_price_history
Work on #10394 log supplier prices
|
2019-02-01 15:41:36 +01:00 |
|
Francis Appels
|
cf9d87df4a
|
Fix travis
|
2019-02-01 15:40:56 +01:00 |
|
Laurent Destailleur
|
cf89fbd165
|
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
New contact related item tab
|
2019-02-01 15:39:39 +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 |
|
Laurent Destailleur
|
a993b9e335
|
Merge pull request #10468 from grandoc/new_branch_31_01_2019
update with html5 compliant code
|
2019-02-01 15:35:20 +01:00 |
|
Laurent Destailleur
|
7fc00001d5
|
Merge pull request #10470 from frederic34/patch-2
remove psr2 else if warning
|
2019-02-01 15:34:23 +01:00 |
|
Laurent Destailleur
|
75252283c0
|
Merge branch 'develop' into master
|
2019-02-01 15:33:36 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
ae81bbac93
|
Better var name
|
2019-02-01 13:49:07 +01:00 |
|
Laurent Destailleur
|
b14a16a119
|
Code comment
|
2019-02-01 13:48:09 +01:00 |
|
Laurent Destailleur
|
849b3b640b
|
Code comment
|
2019-02-01 13:41:23 +01:00 |
|
Francis Appels
|
c4915c679a
|
Merge develop
|
2019-02-01 11:47:03 +01:00 |
|
Francis Appels
|
2c5623c53e
|
check if price already logged, if not first log current price
|
2019-02-01 11:37:46 +01:00 |
|
ATM-Nicolas
|
2cbb58c2eb
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
|
2019-02-01 10:54:42 +01:00 |
|
ATM-Nicolas
|
f432a874e6
|
NEW : Contact related items tab
|
2019-02-01 10:51:28 +01:00 |
|
florian HENRY
|
f7bed44441
|
FIX : quick search for supplier orders
|
2019-01-31 21:39:02 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
a0c0b377b2
|
css
|
2019-01-31 20:53:47 +01:00 |
|
Laurent Destailleur
|
c05628c746
|
Fix edit member module setup
|
2019-01-31 20:27:55 +01:00 |
|
Pierre Ardoin
|
2d6f5ca8ab
|
#Fix : Error in Total Products/Services
Its correct an error in the total of stat Products/Services total.
|
2019-01-31 20:22:56 +01:00 |
|
Laurent Destailleur
|
0a56069f67
|
Fix trans
|
2019-01-31 19:42:55 +01:00 |
|
Frédéric FRANCE
|
b89b0e683a
|
remove psr2 else if warning
|
2019-01-31 18:32:39 +01:00 |
|
Frédéric FRANCE
|
b2e2b2e186
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-31 18:27:27 +01:00 |
|