[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7f950d: Fix user pram_ihm, display ta
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7f950d: Fix user pram_ihm, display tab and allow modify bu... |
|
Date: |
Thu, 28 Nov 2013 08:31:33 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7f950d8b4560579ca9614e68a80bab4e53843cd5
https://github.com/Dolibarr/dolibarr/commit/7f950d8b4560579ca9614e68a80bab4e53843cd5
Author: Florian Henry <address@hidden>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M htdocs/core/lib/usergroups.lib.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Fix user pram_ihm, display tab and allow modify button only is user
right allow it is OK
Commit: ea0bbb5896b541ba84595e4ce7638fa3e13a6289
https://github.com/Dolibarr/dolibarr/commit/ea0bbb5896b541ba84595e4ce7638fa3e13a6289
Author: Florian Henry <address@hidden>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/main.inc.php
M htdocs/product/fiche.php
M htdocs/product/stock/fiche.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: f852c9a5bbc56e01b7b9c4cfa648dbf93fd436c4
https://github.com/Dolibarr/dolibarr/commit/f852c9a5bbc56e01b7b9c4cfa648dbf93fd436c4
Author: Florian Henry <address@hidden>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix [ bug #1145 ] Agenda button list type do not display
Commit: cca303cee64bad0649fee15e05a3a370781c1ca2
https://github.com/Dolibarr/dolibarr/commit/cca303cee64bad0649fee15e05a3a370781c1ca2
Author: Florian Henry <address@hidden>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/orders.lang
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 6615ee7e6f12a8298b29ae84e95c90966f7d75a8
https://github.com/Dolibarr/dolibarr/commit/6615ee7e6f12a8298b29ae84e95c90966f7d75a8
Author: Florian Henry <address@hidden>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/product/stats/commande_fournisseur.php
Log Message:
-----------
[ bug #1148 ] Product consomation : supplier order bad status
Commit: 65b6dca55481b1c7a402f816a8341c78ce10fbc5
https://github.com/Dolibarr/dolibarr/commit/65b6dca55481b1c7a402f816a8341c78ce10fbc5
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M htdocs/user/param_ihm.php
Log Message:
-----------
Fix: business rule to protect button and action was not synchronized
Commit: 08e44135bf9074509c4ae7554c25524dd79df121
https://github.com/Dolibarr/dolibarr/commit/08e44135bf9074509c4ae7554c25524dd79df121
Author: Grand Philippe <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
add missing trad
Commit: fae27842b7781090b7e78667dbca2a77b43a68f9
https://github.com/Dolibarr/dolibarr/commit/fae27842b7781090b7e78667dbca2a77b43a68f9
Author: Grand Philippe <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
A dev/fixnotabfiles.sh
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
Commit: 8f9143cef7065c7b9dacbf5e405bb385b707b6e4
https://github.com/Dolibarr/dolibarr/commit/8f9143cef7065c7b9dacbf5e405bb385b707b6e4
Author: Florian Henry <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M htdocs/core/lib/usergroups.lib.php
M htdocs/user/param_ihm.php
Log Message:
-----------
revert param_ihm
Commit: f1d0879419a3365b0b7f7061237eda3765ac0fa5
https://github.com/Dolibarr/dolibarr/commit/f1d0879419a3365b0b7f7061237eda3765ac0fa5
Author: Florian Henry <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: baebc7e91db24dba5fd6ff7238afd918d03f501c
https://github.com/Dolibarr/dolibarr/commit/baebc7e91db24dba5fd6ff7238afd918d03f501c
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: Not coherent filename
Commit: 4cf2e2503c12eb05896f4c0cf160a99332a2eeac
https://github.com/Dolibarr/dolibarr/commit/4cf2e2503c12eb05896f4c0cf160a99332a2eeac
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
Merge pull request #1320 from grandoc/3.5
3.5
Commit: 216e9b390d2d6fab11182df17bf8a74c2b663e2a
https://github.com/Dolibarr/dolibarr/commit/216e9b390d2d6fab11182df17bf8a74c2b663e2a
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/agenda.lib.php
M htdocs/product/stats/commande_fournisseur.php
Log Message:
-----------
Merge pull request #1321 from FHenry/3.4
Fix [ bug #1145 ] Agenda button list type do not display
Commit: 203a98d4aebc15a192b4d7a8be3cc26632d88088
https://github.com/Dolibarr/dolibarr/commit/203a98d4aebc15a192b4d7a8be3cc26632d88088
Author: Grand Philippe <address@hidden>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M htdocs/compta/paiement/cheque/fiche.php
Log Message:
-----------
fix language and standardize code
Commit: e8e5f4d943d1e32d7daf39a84a54a8ecfb3695f0
https://github.com/Dolibarr/dolibarr/commit/e8e5f4d943d1e32d7daf39a84a54a8ecfb3695f0
Author: Grand Philippe <address@hidden>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
missing trad
Commit: 18ed9d5ca79e2264af097d12969cb8bb3f63c41d
https://github.com/Dolibarr/dolibarr/commit/18ed9d5ca79e2264af097d12969cb8bb3f63c41d
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Filter on accountancy report were lost when using "print" view.
Commit: 0383dc47062900a5fd0d36fc58d6a0ebdd3607b5
https://github.com/Dolibarr/dolibarr/commit/0383dc47062900a5fd0d36fc58d6a0ebdd3607b5
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
Log Message:
-----------
Fix: 2 bugs during validation of a member
Commit: 6729f03ee663981129db23fc84a3cc6a7521ee1d
https://github.com/Dolibarr/dolibarr/commit/6729f03ee663981129db23fc84a3cc6a7521ee1d
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M htdocs/compta/paiement/cheque/fiche.php
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
Merge pull request #1323 from grandoc/3.5
fix language and standardize code
Commit: c3af8b6b292b64da5e86011a55616a865841c669
https://github.com/Dolibarr/dolibarr/commit/c3af8b6b292b64da5e86011a55616a865841c669
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M dev/translation/txpull.sh
M dev/translation/txpush.sh
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/mails.lang
M htdocs/langs/el_GR/stocks.lang
M htdocs/langs/it_IT/contracts.lang
M htdocs/langs/it_IT/cron.lang
M htdocs/langs/it_IT/holiday.lang
M htdocs/langs/it_IT/languages.lang
M htdocs/langs/it_IT/mailmanspip.lang
M htdocs/langs/it_IT/members.lang
M htdocs/langs/it_IT/opensurvey.lang
M htdocs/langs/it_IT/products.lang
M htdocs/langs/it_IT/propal.lang
M htdocs/langs/it_IT/suppliers.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/it_IT/workflow.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/sms.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/boxes.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/orders.lang
M htdocs/langs/tr_TR/products.lang
Log Message:
-----------
Sync from transifex
Commit: 2178ab60076b7dfa1ea3b6189056a4d535d43278
https://github.com/Dolibarr/dolibarr/commit/2178ab60076b7dfa1ea3b6189056a4d535d43278
Author: Florian Henry <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix [ bug #1156 ] Update TVA mass update tools do not work
Commit: afc729c69406ba7162f7dd59b61dd3e2cea8c87c
https://github.com/Dolibarr/dolibarr/commit/afc729c69406ba7162f7dd59b61dd3e2cea8c87c
Author: Florian Henry <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/compta/tva/index.php
Log Message:
-----------
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
Commit: 5f8e896e0c94560e6f5ff83656768e5adbb8f806
https://github.com/Dolibarr/dolibarr/commit/5f8e896e0c94560e6f5ff83656768e5adbb8f806
Author: Florian Henry <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix [ bug #1154 ] Error when closing a service in a contract (pgsql)
Commit: 74d6698f7dbd89caa637cc4b50a095f7ccf63a71
https://github.com/Dolibarr/dolibarr/commit/74d6698f7dbd89caa637cc4b50a095f7ccf63a71
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/compta/tva/index.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #1325 from FHenry/3.5
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
Commit: 894e6a296faddb081ea4a5a096e07ddca79caa02
https://github.com/Dolibarr/dolibarr/commit/894e6a296faddb081ea4a5a096e07ddca79caa02
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Merge pull request #1324 from FHenry/3.4
Fix [ bug #1156 ] Update TVA mass update tools do not work
Commit: 88ae0a79453915a69c033883399673a0d78e2385
https://github.com/Dolibarr/dolibarr/commit/88ae0a79453915a69c033883399673a0d78e2385
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M htdocs/admin/agenda_xcal.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/lib/files.lib.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Fix: the rename function is bugged with some windows. I add a
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
Commit: a3e55822a4173cac18723569edbb48a3e603c1f9
https://github.com/Dolibarr/dolibarr/commit/a3e55822a4173cac18723569edbb48a3e603c1f9
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Missing translation
Commit: bdf8100d843fd03a19fc981ef0d2a247e34b97e5
https://github.com/Dolibarr/dolibarr/commit/bdf8100d843fd03a19fc981ef0d2a247e34b97e5
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/product/admin/product_tools.php
M htdocs/product/stats/commande_fournisseur.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
Commit: d1e62bebf0b542a94d67dd72513b3a4372e731d4
https://github.com/Dolibarr/dolibarr/commit/d1e62bebf0b542a94d67dd72513b3a4372e731d4
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix: Removed a merged that we ddidn't want.
Commit: 5715e9c9868793a77df00ac5b559da512386ccfe
https://github.com/Dolibarr/dolibarr/commit/5715e9c9868793a77df00ac5b559da512386ccfe
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/translation/txpull.sh
M dev/translation/txpush.sh
M htdocs/admin/agenda_xcal.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/tva/index.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/mails.lang
M htdocs/langs/el_GR/stocks.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/it_IT/contracts.lang
M htdocs/langs/it_IT/cron.lang
M htdocs/langs/it_IT/holiday.lang
M htdocs/langs/it_IT/languages.lang
M htdocs/langs/it_IT/mailmanspip.lang
M htdocs/langs/it_IT/members.lang
M htdocs/langs/it_IT/opensurvey.lang
M htdocs/langs/it_IT/products.lang
M htdocs/langs/it_IT/propal.lang
M htdocs/langs/it_IT/suppliers.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/it_IT/workflow.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/sms.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/boxes.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/orders.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/product/stats/commande_fournisseur.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/cd5f2b8239bd...5715e9c98687