Commit Graph

51549 Commits

Author SHA1 Message Date
Laurent Destailleur
7afedd3f8b Minor enhancement of theme MD 2015-11-15 19:29:18 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
frederic34
e0ee6718ad Select warehouse on order card 2015-11-15 11:42:47 +01:00
Laurent Destailleur
db941d5395 NEW Enhance style engine. Add option to set color of links 2015-11-15 11:31:09 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4 Minor look uniformization 2015-11-14 23:10:12 +01:00
Laurent Destailleur
c2ec4a4fd2 Move online help link at a better place (top right). Link is also always
visible.
2015-11-14 22:49:34 +01:00
Laurent Destailleur
6895daa5e9 Fix tr/td not correctly open/closed
Fix default value was not set
2015-11-14 19:31:50 +01:00
Laurent Destailleur
80127cbbc9 Fix tr/td not correctly open/closed
Fix default value was not set
2015-11-14 19:31:16 +01:00
Laurent Destailleur
1da53501a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-14 17:54:28 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
b4af55ab40 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-14 14:57:49 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank
account on PDF.
2015-11-14 14:56:44 +01:00
frederic34
488acfd177 Add statut2 icon and adjust some other 2015-11-14 10:50:26 +01:00
Laurent Destailleur
653fb00a0e Merge pull request #3981 from ParisLiakos/develop
getListOfProductsOrServices() filters are broken
2015-11-13 19:47:44 +01:00
Paris Liakos
298a671342 getListOfProductsOrServices() filters are broken 2015-11-13 20:25:12 +02:00
Laurent Destailleur
5b1e20494b Merge pull request #3977 from FHenry/3.8
FIX : showrefnav htmlspecialchar instead of < >
2015-11-13 19:22:41 +01:00
Laurent Destailleur
3ff42a45d4 Merge pull request #3976 from atm-alexis/3.9_FIX_htmlname_for_ajax_contact
FIX htmlname parameters wasnt applied
2015-11-13 19:22:18 +01:00
Laurent Destailleur
85c0ed39f1 Merge pull request #3974 from atm-ph/fix_38_aufocus
FIX autofocus on input search product
2015-11-13 19:21:52 +01:00
Laurent Destailleur
510e3bc4c2 Merge pull request #3975 from All-3kcis/develop-patch-12
Fix #3542
2015-11-13 19:20:24 +01:00
Florian HENRY
2a2155a239 FIX : showrefnav htmlspecialchar instead of < > 2015-11-13 14:40:52 +01:00
Laurent Destailleur
88356e2e97 Add a new rule on contributing when adding a new table. 2015-11-13 14:32:40 +01:00
Laurent Destailleur
8068d01cfc Add style maxwidth150 2015-11-13 14:16:45 +01:00
Laurent Destailleur
5e67eefff3 Removed phpcs warning 2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Alexis Algoud
965de406d3 FIX htmlname parameters wasnt applied 2015-11-13 11:47:15 +01:00
Laurent Destailleur
bad28c6d92 Fi sntax error 2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
All-3kcis
c59482fea1 Fix #3542 2015-11-13 11:17:23 +01:00
Laurent Destailleur
c7546dbad2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
Laurent Destailleur
682842f15f Fix into title of login page, we must report the tru dolibarr version
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
phf
81a8933256 FIX autofocus on input search product 2015-11-13 10:36:32 +01:00
aspangaro
0f75d76296 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
778941b549 Merge pull request #3948 from marcosgdf/missing-changes
Missing changes of PR #3927
2015-11-13 02:29:56 +01:00
Laurent Destailleur
7d9fde803b Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
471bcdd29f Remove hard coded list of permissions. 2015-11-13 02:21:27 +01:00
Laurent Destailleur
ea6fe02f18 Merge pull request #3923 from altatof/customerinfos
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
0ca9027459 Merge pull request #3973 from frederic34/patch-3
llx_accounting_account ADD INDEX account_number
2015-11-13 00:34:02 +01:00
Laurent Destailleur
e2e804e37a Minor fix 2015-11-13 00:30:10 +01:00
Laurent Destailleur
4065b3f1df Better management of the Dolibarr tracking id into email.
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
74a4006a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
b307431348 Add example of email header to use when sending email from thirdparty
card
2015-11-12 19:01:57 +01:00
Laurent Destailleur
f65829ec42 Merge pull request #3970 from hregis/3.7_bug
Fix: wrong var name
2015-11-12 18:33:12 +01:00
Laurent Destailleur
60535086d4 Merge pull request #3965 from jpfox/patch-2
Correct pattern to match all odt var tags
2015-11-12 18:32:45 +01:00