Regis Houssin
f527602753
Fix: use specific css style instead, this causes a shift problem
2014-09-28 13:12:51 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Laurent Destailleur
8e95f2e223
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-26 12:42:41 +02:00
Laurent Destailleur
bf4b99fa64
Assignation of event to several users is on a very good way for 3.7
2014-09-26 12:27:18 +02:00
Regis Houssin
3ab8b6f7d1
New: add possibility to define a custom error message
2014-09-26 09:44:21 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020
Add field color into table of type of events
2014-09-23 17:54:03 +02:00
Laurent Destailleur
7224f64224
Work on multi user for events.
...
Fix: Modules must be reloaded after migration.
2014-09-23 16:15:15 +02:00
Laurent Destailleur
65a486a48b
Merge pull request #1897 from Cubexed/develop-patch-2
...
Closed projects are greyed out in project selector
2014-09-23 00:08:46 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
08d4195504
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767
Missing hook to add button on intervention
...
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
Marcos García de La Fuente
8f492a6677
Documented commonObject::commonGenerateDocument
2014-09-22 00:18:36 +02:00
aspangaro
e147259e95
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
2014-09-21 20:30:55 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
cf7973d0fa
Doxygen
2014-09-20 01:26:53 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
2b602e7b5a
Qual: Uniformize param names. contactidp -> contactid
2014-09-18 18:46:00 +02:00
Laurent Destailleur
6c522f8772
Merge pull request #1898 from GPCsolutions/ciforeveryone
...
Fixed typo
2014-09-18 17:25:18 +02:00
Laurent Destailleur
5a14a44100
Doxygen
2014-09-18 11:13:23 +02:00
Raphaël Doursenaud
c15849df2d
Fixed typo
2014-09-17 16:40:35 +02:00
Cubexed
9ed77c6060
Closed projects are greyed out in project selector
2014-09-17 15:42:48 +02:00
Laurent Destailleur
a834796181
New: Content of predefined email come firstly from table
...
llx_c_email_template, then translation key.
2014-09-17 01:12:59 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
8487913209
Fix: default setup of type of action
2014-09-15 19:27:45 +02:00
Laurent Destailleur
9ea3e33f94
Fix: Can edit status of event.
...
New: Onto event summary of elements, end date and status are visible.
2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90
New: Add option AGENDA_DEFAULT_TYPE
...
Fix: id is not set on field.
2014-09-15 17:34:32 +02:00
Laurent Destailleur
7fc8799c3d
Qual: Clean code from user table tr td
2014-09-15 16:18:19 +02:00
Laurent Destailleur
2dbbc76645
Fix: Trigger error not reported
2014-09-15 11:48:50 +02:00
Marcos García de La Fuente
7a28f8e4aa
[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
2014-09-14 13:59:06 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
744f370920
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-11 17:47:58 +02:00
Laurent Destailleur
7851587a11
Merge pull request #1869 from FHenry/3.6
...
Extrafield feature select from table should try to translate multiple column when not needed
2014-09-11 17:13:28 +02:00
Laurent Destailleur
f19e469b5f
Work on feature to assign several users to an event.
2014-09-09 14:38:10 +02:00
Laurent Destailleur
9e2a0cb671
Fix: debug of accountancy module
2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2
Fix: duplicate entity encoding into select_array.
2014-09-08 23:08:59 +02:00
Laurent Destailleur
a3bbf2aff9
Fix: Correct height of empty line for thirdparties combo list.
2014-09-08 12:05:24 +02:00
Laurent Destailleur
2f6493dabd
Sync transifex
2014-09-08 11:58:45 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
bf0b578e5a
Fix: Sort at wrong place
...
Fix: sql syntax error (field were renamed)
2014-09-06 16:24:44 +02:00
Laurent Destailleur
522b5a91bc
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:16:24 +02:00
Laurent Destailleur
e7e48f6b2b
Doxygen
...
Add constant to enable bank during proposal (not enough common).
2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505
Fix: Do not use   as value of a list
2014-09-04 19:27:59 +02:00
Florian HENRY
85cabbf921
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
...
Conflicts:
ChangeLog
2014-09-04 18:29:17 +02:00
Laurent Destailleur
b88b4fbc2c
Fix: bad balance of td
2014-09-04 15:17:15 +02:00
Laurent Destailleur
8ec61b8ac6
Fix: bad balance of td
2014-09-04 14:43:16 +02:00
Laurent Destailleur
32fd2e03ce
More log into notify class
2014-09-04 14:38:30 +02:00
Laurent Destailleur
7021f4fb01
Fix: Message show when dir is out of sync with database cache was wrong.
2014-09-03 16:09:14 +02:00
Laurent Destailleur
ca322942ae
I remove the extend into commonobjectline to common object.
...
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
2014-09-03 09:49:50 +02:00
Florian HENRY
9b40cc9e89
fix
2014-09-02 12:09:43 +02:00
Laurent Destailleur
154d1520fb
Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1
2014-08-30 20:36:53 +02:00
Regis Houssin
48f9ef2574
Fix: php strict mode saga
2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb
Fix: php strict mode saga
2014-08-28 15:52:58 +02:00
Regis Houssin
139cf10c7c
Fix: php strict mode saga
2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37
Fix: another strict mode alert
2014-08-28 15:36:57 +02:00
Regis Houssin
714da05034
Fix: another strict mode alert
2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7
Fix: another strict mode alert
2014-08-28 15:34:50 +02:00
Alexis Algoud
40aadc8125
add extrafield in add form
2014-08-26 12:11:34 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
be6f99c10e
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/db/mysql.class.php
htdocs/core/db/mysqli.class.php
htdocs/core/lib/ajax.lib.php
2014-08-17 19:34:12 +02:00
Laurent Destailleur
4f206a2125
Fix: Missing empty field
2014-08-17 19:27:25 +02:00
Laurent Destailleur
45927cc986
Fix pb of links into state-region-country:
...
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
2014-08-17 17:47:25 +02:00
Laurent Destailleur
96cb9fe6cb
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-15 02:35:06 +02:00
Laurent Destailleur
c17f5e7f00
Accept property fk_thirdparty instead of fk_soc
2014-08-14 16:04:42 +02:00
Laurent Destailleur
6b26ae6f1f
Fix: Header of tables must use th and not td
2014-08-14 13:30:44 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb
Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-accounting3
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-14 00:59:48 +02:00
Laurent Destailleur
40349a9f53
Fix: Removed bad char
2014-08-14 00:55:27 +02:00
Laurent Destailleur
454cb1cbf8
Enhance skeleton
...
Add code_iso3 into array
2014-08-13 19:19:36 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
6fd77e7ef6
Merge branch 'Upstream/develop'
2014-08-11 13:26:58 +02:00
Florian HENRY
aabbc331a4
Fix output extrafield selllist
2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5
Fix bug in output extrafields sell list
2014-08-11 13:09:35 +02:00
Laurent Destailleur
4ce2495a33
Fix: Parameter morefilter is missing.
2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86
New: Select list of users can return user into hierarchy.
2014-08-11 11:29:47 +02:00
aspangaro
9af336b53b
Add accountancy code for trips & fees and renamed libelle field into label
2014-08-10 20:41:52 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
4922071af9
New: When a translation is not available we always jump to en_US and
...
only en_US.
2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1
Merge pull request #1807 from atm-maxime/develop
...
New: Intervention documents are now available in ECM module
2014-08-08 01:56:33 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Maxime Kohlhaas
3b14fa2b35
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-08-07 12:27:46 +02:00
Laurent Destailleur
a49bce10de
Fix: When disabled, all fields must be disabled. Need backport.
...
Conflicts:
htdocs/projet/activity/list.php
2014-08-07 12:09:28 +02:00
Laurent Destailleur
ebc11a7a9c
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:50:25 +02:00
Laurent Destailleur
96b49cfabe
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:08:36 +02:00
Laurent Destailleur
20cef1512f
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c
Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported
2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
5e63f16d32
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2014-08-06 09:58:10 +02:00
Laurent Destailleur
2624632fde
Fix: bad test commande_send -> order_send
2014-08-05 19:55:14 +02:00
Laurent Destailleur
e95a9cad03
New: When force of bcc is set, we show it onto email form.
2014-08-05 19:32:24 +02:00
Maxime Kohlhaas
1b3efbb9a3
New : add attachments on user cards
2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
90c397d1a4
New: Intervention documents are now available in ECM module
2014-08-05 15:24:49 +02:00
Laurent Destailleur
20d6920a0c
Add comment
2014-08-05 09:27:40 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2014-08-04 22:18:30 +02:00
Laurent Destailleur
b8a0f6aec9
New: Add option to foce delivery receipt to yes
2014-08-04 19:03:15 +02:00
Laurent Destailleur
3024d82536
Merge pull request #1786 from atm-maxime/develop
...
Fix on class not extending commonobject
2014-08-04 08:58:54 +02:00
Laurent Destailleur
1f2cc71975
New: Supervisor is now visible into user list.
2014-08-03 11:36:00 +02:00
Florian HENRY
b0011d0514
remove debug
2014-08-01 16:50:47 +02:00
Florian HENRY
17e272c8ac
Fix extrafield parameters for sellist
2014-08-01 16:48:16 +02:00
Florian HENRY
44f06bef22
Unpaid invoice launch fusion PDF action even if it is only search (with
...
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80
Fix : Fusion PDF button on unpaid invoice is no more displayed
2014-08-01 15:05:43 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Maxime Kohlhaas
94fee7af70
Call trigger added in commonobjectline
2014-08-01 08:59:08 +02:00
Laurent Destailleur
852b78f79f
Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
...
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Laurent Destailleur
2d97ad5177
Merge pull request #1771 from frederic34/selectdelivery
...
Select Shipping Method in Propal, Order
2014-07-30 11:31:22 +02:00
Laurent Destailleur
6226d39cda
Fix: Pb when option javascript disabled.
2014-07-29 19:45:48 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4
Fix: When option to use optimize display for text borwser and blin
...
person is on, box addon was broken.
2014-07-29 00:50:57 +02:00
Laurent Destailleur
096a61d5c0
Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
...
translate.
2014-07-28 20:35:32 +02:00
frederic34
6d5767e464
Merge remote branch 'upstream/develop' into selectdelivery
2014-07-28 20:15:40 +02:00
Laurent Destailleur
c20256f702
Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
...
translate.
2014-07-28 20:12:01 +02:00
Laurent Destailleur
3011ecf6df
Fix: PHPCS
2014-07-28 19:55:12 +02:00
Laurent Destailleur
827bf4b22a
Merge pull request #1778 from frederic34/patch-2
...
Update html.form.class.php
2014-07-28 19:48:16 +02:00
frederic34
395b003266
Merge remote branch 'upstream/develop' into selectdelivery
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-28 17:10:07 +02:00
frederic34
36c5b2d69c
Update html.form.class.php
...
By example, avoid to have html code in customer name
2014-07-28 14:04:55 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
Laurent Destailleur
bf9313dd87
getBrowserInfo can return type of layout (classic/phone/tablet)
2014-07-27 20:56:26 +02:00
Laurent Destailleur
b964f9e9e3
New: Add info page about browser.
...
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
frederic34
5258c522ce
Some cleaning
2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd
The delivery method is transmited in shipment
2014-07-25 21:50:21 +02:00
frederic34
f0a7cc3268
Select Shipping Method in Propal
2014-07-24 18:08:08 +02:00
frederic34
5ef626813c
Update html.form.class.php
2014-07-23 09:49:58 +02:00
Laurent Destailleur
cfc337a79a
Qual: Enable php checkstyle rule Zend.Files.ClosingTag
...
Fix: Solve a lot of checkstyle errors.
2014-07-20 15:27:38 +02:00
Laurent Destailleur
f46db55f71
Merge pull request #1753 from marcosgdf/triggers-refactor
...
Refactored Dolibarr triggers
2014-07-20 04:52:27 +02:00
Laurent Destailleur
8137fd7fe4
Fix: Type of line (product/service) could not be edited on supplier
...
order/invoice.
2014-07-20 02:36:03 +02:00
Laurent Destailleur
04a20d2008
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
...
prefix on uploaded file names.
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +02:00
Laurent Destailleur
b42a33b203
Fix: For contract, only services available by default. Product appears
...
if option is set only.
2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
7e29889eab
Fixed little bug
2014-07-18 03:13:15 +02:00
Marcos García de La Fuente
c8338f45c4
Refactored Dolibarr triggers:
...
Created a DolibarrTriggers abstract class.
Moved common variables out of construct class
Improved run_trigger method signature
2014-07-18 02:59:46 +02:00
Laurent Destailleur
6a19cc614a
Merge pull request #1737 from GPCsolutions/accessibility
...
Accessibility
2014-07-16 15:15:03 +02:00
Laurent Destailleur
8a8a90de78
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +02:00
Laurent Destailleur
32a6d59b64
Merge pull request #1734 from FHenry/3.5
...
Fix
2014-07-14 23:13:03 +02:00
Marcos García de La Fuente
4bc8e026b6
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
2014-07-13 19:51:44 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
94bcb0dc40
Labels and autofocus for company card forms
2014-07-12 14:45:23 +02:00
Raphaël Doursenaud
f1853c435b
More labels and autofocus for thirdparty and contact forms
2014-07-12 12:04:39 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
Raphaël Doursenaud
78ce6c0b1c
Added labels on form elements for company creation
2014-07-11 19:57:51 +02:00
Florian HENRY
b9df48d48c
Fix
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
2014-07-11 15:53:31 +02:00
KreizIT
b8499a80ec
Refactor: LINK_* trigger
2014-07-11 15:08:01 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
Laurent Destailleur
4dfaf9ce38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661
New: Type of thirdparties can accept a country (to show list of types
...
specific for a country).
2014-07-11 13:56:35 +02:00
Raphaël Doursenaud
55d062784d
Added labels on objectline form elements
2014-07-11 13:25:44 +02:00
Florian HENRY
3f23b116c6
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
...
projet
2014-07-11 11:44:54 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
688d58413b
Merge pull request #1710 from aspangaro/develop-accounting2
...
New feature :: Add fiscal year
2014-07-07 21:28:35 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
9949713d20
Some cleaning
2014-07-07 18:40:18 +02:00
KreizIT
4e08e2b5d5
Fix rollback and test errno
2014-07-07 11:32:56 +02:00
Laurent Destailleur
96ec3ad7f4
Fix: Allow percent to solve presentation pb by some pages.
2014-07-07 00:14:24 +02:00
Laurent Destailleur
4dbc1dd1c6
Merge remote-tracking branch 'origin/3.6' into develop
2014-07-06 21:09:10 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
aspangaro
e294fe1edd
Update
2014-07-05 21:58:39 +02:00
aspangaro
7892852f44
Merge branch 'Upstream/develop'
2014-07-05 21:56:47 +02:00
Florian HENRY
02574a7af2
Fix Ajax combobox in Extrafeilds
...
Add Extrafield on contract
2014-07-05 11:17:50 +02:00
Laurent Destailleur
fa82cbceb9
Qual: Removed useless function
2014-07-05 08:59:41 +02:00
aspangaro
9eaeaae2fb
Merge branch 'Upstream/develop'
2014-07-05 08:48:51 +02:00
aspangaro
be78e96313
Bug fix & add tab info
2014-07-05 08:47:01 +02:00
Laurent Destailleur
8e2999f73f
Fix: phpcs
2014-07-04 14:19:03 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
aspangaro
a2ac578712
Merge branch 'Upstream/develop'
2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85
use count() instead sizeof()
2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with company
2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c
New: More option to define default filter setting of agenda views.
2014-06-29 23:35:00 +02:00
aspangaro
46320071a0
Merge branch 'Upstream/develop'
2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d
Update
2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94
Fix: typo
2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
...
sender.
2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1
Add comments
2014-06-28 14:06:29 +02:00
Laurent Destailleur
29dfb71bbd
Merge branch 'patch-11' of github.com:defrance69/dolibarr into
...
defrance69-patch-11
Conflicts:
htdocs/core/class/commonobject.class.php
2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1
Using hidden constant to use the feature
...
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
2014-06-26 22:34:40 +02:00
Laurent Destailleur
a2f610ffbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a
Merge pull request #1686 from KreizIT/movetrig
...
Fix [ bug #1459 ]
2014-06-26 21:01:48 +02:00
Laurent Destailleur
2deadea40a
New: Filter on event status
2014-06-26 20:24:00 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
KreizIT
92f1778c9d
Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error
...
Start refactoring trigger call from within object
2014-06-25 16:51:26 +02:00
Laurent Destailleur
f64f0d6933
Fix: If showempty is 0 and empty, do not show button.
2014-06-24 23:43:53 +02:00
aspangaro
56785f1149
Merge branch 'Upstream/develop'
2014-06-24 06:10:47 +02:00
Laurent Destailleur
c18d7de7b0
Fix: Use bad var for test
2014-06-22 13:33:31 +02:00
Laurent Destailleur
dce0c38533
Fix: Add hidden option so we can restore old behaviour (duration is
...
free) for people that can't work with new one.
2014-06-21 16:06:59 +02:00
Laurent Destailleur
5c0813e865
Fix: EMail test feature to make a test without html must not include any
...
html.
2014-06-21 01:26:41 +02:00
Laurent Destailleur
a72c3d4381
Merge branch 'develop' of github.com:atm-maxime/dolibarr into
...
atm-maxime-develop
Conflicts:
htdocs/core/class/html.formprojet.class.php
2014-06-20 17:11:12 +02:00
Laurent Destailleur
2dc3e5b104
Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE
...
trigger (Add a protection to avoid multiple errors).
2014-06-20 16:20:39 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Maxime Kohlhaas
dd83a52fb1
Fix : project list was showing all projects instead of company project. This wasn't matching the function comments.
2014-06-20 13:59:50 +02:00
Laurent Destailleur
a2065d0b6a
Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a
...
supplier order.
2014-06-20 13:49:59 +02:00
Florian HENRY
9bb537f399
- New: If multilangue is enabled, mail (from propal, invoice, etc...)
...
message is pre-defaulted in Customer language
2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-06-17 12:01:45 +02:00
Maxime Kohlhaas
19a3194b02
Fix : duedate was not auto calculated + move calculation function to common invoice class
2014-06-14 12:53:02 +02:00
Florian HENRY
42e6727e5d
Better error return
2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b
Fix link element from project "associates object" pages
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
2014-06-13 15:54:37 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
0ed2481a20
Removed unuseful errors
2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Laurent Destailleur
b4ef780274
Fix: When project was disabled, label was not visible
2014-06-12 15:41:00 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d
Fix: Confusion between is_int and is_numeric.
2014-06-09 15:21:20 +02:00
Laurent Destailleur
48cdd3c13f
Fix: extra fields key.
2014-06-06 16:08:42 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Laurent Destailleur
c45aace9b9
Add easy fix to solve pb of links for some modules.
2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63
Fix: Missing global
2014-06-05 22:42:49 +02:00
Florian HENRY
0de66e838c
camel case
2014-05-30 12:01:26 +02:00
Laurent Destailleur
fb0f0047e7
Merge pull request #1633 from aspangaro/develop
...
Typo / Missing key language / Fix limit list on mass movement stock page
2014-05-30 11:33:08 +02:00
Laurent Destailleur
82a2a723c3
Fix: [ bug #1419 ] Margins module shows margin of sold services even if
...
services module is disabled
2014-05-29 21:01:00 +02:00
Laurent Destailleur
56d71f0da0
Fix: edit form
...
Fix: pgsql driver
2014-05-29 19:56:15 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Florian HENRY
f87772f3ec
Add comment for travis
2014-05-29 14:56:55 +02:00
Florian HENRY
d15c3b2c23
CRLF
2014-05-29 14:30:09 +02:00
Florian HENRY
d304c7785e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/pomme.modules.php
2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711
Better target emailing status mangement
2014-05-29 14:26:27 +02:00
aspangaro
e856e64bc9
Typo
2014-05-28 06:17:09 +02:00
aspangaro
b384f91096
Merge branch 'upstream/develop'
2014-05-28 05:35:35 +02:00
aspangaro
dce9c2bc76
Fiscal year - 1st step
2014-05-28 05:34:10 +02:00
Laurent Destailleur
51b6be4a64
Fix: If user has no perm to see other user, see himself.
2014-05-26 17:33:19 +02:00
Laurent Destailleur
1199d54fb2
Fix: When user has no permissions to see all other user, we must keep
...
only user.
2014-05-26 17:21:48 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
4b9d1b901b
Fix: [ bug #1401 ] Problème avec la génération des codes barres
2014-05-25 17:14:33 +02:00
Laurent Destailleur
8e7b310fb6
Fix: [ bug #1400 ] Silent Warning create a draft invoice
2014-05-25 05:01:14 +02:00
BENKE Charles
3d7b6e9a26
Update commonobject.class.php
2014-05-24 19:51:05 +02:00
Florian HENRY
87b9d0412c
Fix element page on project
2014-05-22 12:51:00 +02:00
guerinaxel
1dbcd215b8
Correcting log use for commonobject.class.php
...
Correcting dol_syslog use which had 3 parameters instead of 2.
2014-05-19 15:54:43 +02:00
BENKE Charles
c8067931e3
Update commonobject.class.php
2014-05-19 09:32:42 +02:00
BENKE Charles
b210d7a00f
Update commonobject.class.php
...
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
2014-05-18 14:59:20 +02:00
Laurent Destailleur
15796ec592
Fix: checkstyle errors
2014-05-14 12:19:45 +02:00
Laurent Destailleur
b3b7da8f08
Merge pull request #1595 from FHenry/develop
...
Add showempty into combobox
2014-05-14 11:46:35 +02:00
Laurent Destailleur
757d92a318
Merge pull request #1589 from aternatik/resource_core
...
Core integration of resource module
2014-05-14 11:25:25 +02:00
Florian HENRY
1f1a9e46fd
Fix warning
2014-05-13 19:12:14 +02:00
Laurent Destailleur
f621f7eb32
Fix: The rounding mode is now forced when provided explicitly and no
...
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
f918ae7e4f
Decrease log level for disabled trigger
2014-05-13 10:36:01 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
18848eaf74
Clean forms
2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d
Start to clean code of templates to input lines
2014-05-12 12:53:10 +02:00
Laurent Destailleur
bb4eed0a1e
Merge pull request #1591 from defrance69/patch-9
...
Update commonobject.class.php
2014-05-12 01:56:39 +02:00
Laurent Destailleur
6b1bdf9913
Merge pull request #1587 from aternatik/odt_thirdpartycontact
...
Fix : bad call of extrafields into contact substitution
2014-05-12 01:53:41 +02:00
BENKE Charles
8c8c641411
Update commonobject.class.php
...
$objecttype == 'order_supplier' already tested on the previous else if
2014-05-11 23:19:18 +02:00
Laurent Destailleur
8428caf8fb
List cleaner
2014-05-11 21:59:35 +02:00
jfefe
04161084cf
Fix : missing method to delete linked resource
2014-05-11 12:26:57 +02:00
jfefe
225c7ae07b
New : link resource with any element
...
With tpl system, external modules can declare resource with hook getElementResources
2014-05-10 22:07:54 +02:00
Jean-François Ferry
fdb50ab116
Move generic function from commonobject.class to functions2.lib.php (work on resource module)
2014-05-10 22:06:22 +02:00
Jean-François Ferry
bb58bed930
In commonoobject add method for adding resource to an element
2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab
Move resource module functions into commonobject :
...
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
2014-05-10 22:03:05 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
jfefe
31044f1f72
Fix : bad call of extrafields into contact substitution (works with socpeople)
2014-05-10 18:51:54 +02:00
Laurent Destailleur
a627dd9ae8
Fix: Duplicate line when project has no tasks.
2014-05-09 17:14:40 +02:00
Laurent Destailleur
9add45aea3
Qual: Mutualize code.
2014-05-07 13:22:02 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
3abede630b
Fix: [ bug #1365 ] ODT template tag {company_note} does not get
...
replaced.
2014-05-06 23:36:01 +02:00
Laurent Destailleur
e214cdf231
Fix: [ bug #1365 ] ODT template tag {company_note} does not get
...
replaced.
2014-05-06 23:35:09 +02:00
Laurent Destailleur
460b5296ba
Fix: [ bug #1353 ] Email notifications, wrong URL
2014-05-06 22:21:34 +02:00
Laurent Destailleur
131f133e07
New: Merge free product and predefined product area to enter new
...
product (Supplier orders now use same template than customer
orders/proposal/invoices).
2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46
New: Merge free product and predefined product area to enter new
...
product.
2014-05-05 14:30:08 +02:00
Laurent Destailleur
cc8dcacbc9
New: DolEditor can accepts percent instead of nb of cols for textarea
...
mode.
2014-05-05 13:41:25 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
c2c0a9b4bb
Merge pull request #1568 from GPCsolutions/closingtagremoval
...
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf
Merge pull request #1567 from marcosgdf/doc
...
Improved documentation of Societe and started type hinting variables
2014-05-04 18:07:08 +02:00
Laurent Destailleur
5a9cca62a6
Clean code
2014-05-04 17:38:26 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
105d892d27
Corrected Translate::getLabelFromKey doc
2014-05-03 13:42:34 +02:00
Laurent Destailleur
e1d30837e9
Try to remove a warning
2014-05-03 03:10:58 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
7bb23086b8
Fix: Strict mode
2014-05-01 17:06:14 +02:00
Laurent Destailleur
6a53a4e0d2
Fix: doxygen
2014-05-01 16:43:40 +02:00
Laurent Destailleur
21716a0c7c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-01 16:27:16 +02:00
Laurent Destailleur
b56f59b313
Perf: Avoid to isntantiate object 'form' into 'subform' classes when
...
already available.
Qual: Better information into xdebug page.
2014-05-01 16:26:57 +02:00
Laurent Destailleur
ee6cac8294
Doc
2014-05-01 16:11:29 +02:00
Laurent Destailleur
0219d53f69
Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact
2014-05-01 11:22:32 +02:00
jfefe
fd45bb16bd
Fix : make ODT substitution for company after contacts
2014-04-30 19:18:51 +02:00
Laurent Destailleur
a574aeff96
Qual: Removed warning
2014-04-30 15:30:20 +02:00
Laurent Destailleur
b11bd00e9a
Fix: Removed blank lines at beginning of email when contact not defined
2014-04-30 15:17:39 +02:00
Laurent Destailleur
880f77b7e1
Fix: Preview feature
2014-04-30 13:50:25 +02:00
Jean-François Ferry
00cd616f4c
Add informations about contacts of thirdparty into ODT
2014-04-30 10:36:23 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
4cb671f4db
Qual: Clean deprecated code.
2014-04-28 11:55:08 +02:00
Laurent Destailleur
8c5bc11def
Qual: Better error message for LDAP connection
2014-04-27 14:16:29 +02:00