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 |
|
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 |
|
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 |
|