aspangaro
c65678d00a
Update cactus numbering model
2016-11-11 07:36:26 +01:00
aspangaro
60219fa84d
Update tulip model
2016-11-11 07:06:45 +01:00
Laurent Destailleur
52080fb917
Fix code not reachable
2016-11-08 20:06:50 +01:00
Laurent Destailleur
18d1878775
Debug accountancy module
2016-11-06 13:07:49 +01:00
Maxime Kohlhaas
e5418a7624
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-11-06 11:36:08 +01:00
BENKE Charlie
7be49e47b8
indenting and little refactoring
2016-11-01 17:09:51 +01:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-10-29 18:44:55 +02:00
Maxime Kohlhaas
be493fcf09
Fix bad parameter in hook call
2016-10-28 10:16:58 +02:00
Laurent Destailleur
27808b7f81
Merge pull request #5915 from aspangaro/5.0-p29
...
NEW Expense report documents are now available in ECM module
2016-10-26 10:57:23 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
phf
3e2f39fbc0
Fix on first activate module it must create if needed the first currency rate from general settings
2016-10-25 13:31:36 +02:00
aspangaro
d0544b0aea
Merge remote-tracking branch 'Upstream/develop' into 5.0-p29
2016-10-24 05:27:49 +02:00
aspangaro
337e9db046
New: Expense report documents are now available in ECM module
2016-10-24 05:26:19 +02:00
Laurent Destailleur
ffcfe30529
FIX Avoid errors on debian
2016-10-22 16:51:54 +02:00
florian HENRY
5f3eb9097e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_resource_extrafields
2016-10-21 13:51:53 +02:00
Laurent Destailleur
c4dd689b08
Clean unreachable code
2016-10-21 11:53:41 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/societe/list.php
2016-10-16 19:02:36 +02:00
Laurent Destailleur
b51b6fa8c8
Merge pull request #5865 from atm-florian/develop
...
NEW : Export thirdparty with payement terms and mode
2016-10-15 02:18:07 +02:00
Laurent Destailleur
4fb66cf7a4
Better explanation for ftp module setup to avoid error with FTPS/SFTP.
2016-10-15 02:11:49 +02:00
Laurent Destailleur
78182ab504
Fix sepa mandate translation
2016-10-14 17:47:05 +02:00
florian HENRY
0b78f7f101
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2016-10-14 10:05:28 +02:00
Sergio Sanchis Climent
567f7e5365
FIX : #5340
2016-10-14 00:43:10 +02:00
Laurent Destailleur
7c1b74133a
Debug accountancy module
2016-10-13 22:29:49 +02:00
florian HENRY
4e34b6e0c6
Merge remote-tracking branch 'origin/develop' into develop
2016-10-12 19:00:32 +02:00
florian HENRY
cc28391944
NEW : Export thirdparty with payement terms and mode
2016-10-12 18:59:34 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
Laurent Destailleur
03876ba637
Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right
...
NEW : Reopen a paid bill is a user right
2016-10-07 13:31:10 +02:00
Laurent Destailleur
c982409c72
Fix a deadlock feature
2016-10-06 15:29:10 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Maxime Kohlhaas
c4b9692575
Missing comment
2016-10-03 09:46:31 +02:00
Maxime Kohlhaas
51d5de2e22
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-10-03 01:07:04 +02:00
Laurent Destailleur
a192045be2
FIX PHPCS
2016-10-03 00:47:11 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
51df25509e
Fix conflicts on default doc template when enabling/disabling modules
2016-10-02 20:00:57 +02:00
Maxime Kohlhaas
578cab9a70
Error management + show nb insert/update + langs
2016-10-02 19:14:28 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
3efa0e411d
NEW Add a direct debit mandate PDF template.
2016-10-02 15:29:43 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
e3aa84ff5a
NEW Add last activation date as info in module list.
2016-10-02 10:41:22 +02:00
Laurent Destailleur
2668cb20cc
Work on SEPA mandate
2016-10-01 20:45:50 +02:00
Laurent Destailleur
c9792ff047
Fix translation
2016-10-01 20:12:00 +02:00
Laurent Destailleur
5a1e96b598
FIX #5823 better multicompany support for member module
2016-10-01 18:55:37 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698
FIX #5746 chrome php
...
Try a fix. Not sure it solved all problems reported
2016-10-01 17:27:52 +02:00
Laurent Destailleur
d079247b2b
FIX #5813 Bug: Incoterms not being read correctly
2016-10-01 13:32:24 +02:00
Laurent Destailleur
d9ff53eb7f
Fix travis errors
2016-09-30 15:22:58 +02:00
Laurent Destailleur
287f9972a8
Merge branch 'new_no_default_rights' of
...
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights
Conflicts:
htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f
Fix the info if module are provided by module or not was wrong
2016-09-30 13:02:13 +02:00
Laurent Destailleur
b412baa880
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-29 10:49:47 +02:00
Laurent Destailleur
214dc2cba0
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-09-29 10:49:00 +02:00
Laurent Destailleur
0b49d6316e
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-29 10:48:14 +02:00
gauthier
03d126810c
FIX : "reopen " new right must respect advanced user rights management
2016-09-29 10:15:34 +02:00
Laurent Destailleur
4702fdc8d7
Merge pull request #5805 from simnandez/develop
...
New: Add thirdparty extrafields to export thirdparty categories
2016-09-28 20:25:04 +02:00
Laurent Destailleur
e99f115a8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/tables/llx_user.sql
2016-09-28 19:49:36 +02:00
Laurent Destailleur
bfd5bb37c5
Code comment
2016-09-28 18:07:31 +02:00
Juanjo Menent
b99b97573d
New: Add thirdparty extrafields to export thirdparty categories
2016-09-28 10:53:22 +02:00
Juanjo Menent
30050b51f0
FIX: Failed to export contact categories with contact extra fields
2016-09-28 10:15:41 +02:00
gauthier
ad03bdf3b9
FIX : reopen invoice is an advanced right and default value is 1
2016-09-26 17:39:46 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
gauthier
7ad2fda289
NEW : Reopen a paid bill is a user right
2016-09-22 15:06:39 +02:00
Laurent Destailleur
f1166f1898
Fix warning
2016-09-22 13:00:02 +02:00
Laurent Destailleur
d598e206cd
Fix warning
2016-09-22 12:56:48 +02:00
Laurent Destailleur
619b65e0b6
Fix warning
2016-09-22 11:06:39 +02:00
Laurent Destailleur
95f2cae825
Start to work on sepa mandate generation
2016-09-19 00:26:30 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
03c312e35c
Fix bad name for modules_action.php
2016-09-10 16:09:46 +02:00
Laurent Destailleur
858291c3a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
417b2f566f
FIX Translation of "Name" is not a good choice for floow-up.
2016-09-08 17:31:42 +02:00
Raphaël Doursenaud
d89a877a00
Added the new familyinfo property from 4.0.0
2016-09-08 16:58:01 +02:00
Raphaël Doursenaud
f97f011cd3
Added missing properties in modules class.
...
Enhanced modules class documentation.
2016-09-08 16:37:48 +02:00
Raphaël Doursenaud
4126928804
Fixed code discrepancy
...
Most places and samples used editor_url so I opted for that.
2016-09-08 16:37:45 +02:00
Laurent Destailleur
5aaa3028a2
FIX Better position of fields in expense report PDF.
2016-09-07 01:47:09 +02:00
Laurent Destailleur
cc9230c07f
FIX Columns truncated and translation missing
2016-09-06 13:08:49 +02:00
Laurent Destailleur
8419202588
NEW Support free bottom text and watermark on expense report template
2016-09-06 12:47:18 +02:00
Laurent Destailleur
571aae7026
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 21:52:20 +02:00
Laurent Destailleur
0e4b4ee321
Merge branch 'develop-external-logging' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging
Conflicts:
composer.json
2016-09-02 21:51:25 +02:00
Laurent Destailleur
b01d1979f8
Merge pull request #5680 from aspangaro/5.0-p7
...
NEW: Move Expense report menu from module to menu files (Again)
2016-09-02 18:39:49 +02:00
Laurent Destailleur
e62299d67e
NEW Add date into list of print jobs for Google Print.
2016-08-31 14:36:08 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
aspangaro
b5f093436e
NEW: Move Expense report menu from module to menu files (Again)
2016-08-30 21:43:17 +02:00
Laurent Destailleur
6ddd264178
Fix not used field
2016-08-28 17:45:20 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Maxime Kohlhaas
5b9acef10c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_modimport_update_option
2016-08-23 10:51:00 +02:00
Maxime Kohlhaas
e6411dd246
Start work to allow updates in import module
2016-08-22 12:25:03 +02:00
Laurent Destailleur
1fc5715040
Fix date of contract not used
2016-08-20 00:30:09 +02:00
Laurent Destailleur
69e6f6a489
Merge pull request #5608 from aspangaro/4.0-p40
...
Fix: Some problems on export with language
2016-08-17 15:54:36 +02:00
Laurent Destailleur
ba8c2dbf9f
Fix order of module for demo.
2016-08-17 11:39:11 +02:00
Laurent Destailleur
47489265b1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-17 11:15:30 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
Laurent Destailleur
7cc7ac5485
Fix translation
2016-08-11 17:41:09 +02:00
aspangaro
26df66f9ac
Fix: Missing language file for salaries export
2016-08-10 15:11:51 +02:00
aspangaro
4e39c41215
Fix: Typo on invoice export
2016-08-10 15:07:53 +02:00
aspangaro
cdd84244b2
Fix: Missing Language file and key for category contact export
2016-08-10 14:48:26 +02:00
aspangaro
8028b77966
Fix: MIssing language file for category members export
2016-08-10 14:39:51 +02:00
aspangaro
c442ff0d2b
Fix: Missing language file for user export when the module members is on
2016-08-10 14:29:19 +02:00
aspangaro
43ffb061ef
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-10 08:07:27 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
2133b1c3b5
NEW Table with list of lots/serial can be viewed (module product batch).
2016-08-08 20:31:03 +02:00
Laurent Destailleur
782ab6a02b
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php
2016-08-05 00:42:40 +02:00
Laurent Destailleur
5126786d60
NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED
2016-08-04 15:48:34 +02:00
Laurent Destailleur
d688681605
Use standard prefix for supplier order for new install
2016-08-04 15:45:55 +02:00
florian HENRY
5144f21c6c
FIX php Strict
2016-08-02 15:36:00 +02:00
Laurent Destailleur
4a1e263e68
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-01 15:19:25 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
97dd1f4bbb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
Laurent Destailleur
803fe68061
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
Laurent Destailleur
49258db58d
NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF.
2016-08-01 14:20:41 +02:00
Laurent Destailleur
edbd92ee3e
NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO
2016-08-01 11:16:22 +02:00
Laurent Destailleur
0414f09e48
Fix permissions
2016-07-30 21:09:30 +02:00
Laurent Destailleur
ceb6199e87
Fix default numbering module of customer code was not enabled.
2016-07-30 12:31:32 +02:00
Laurent Destailleur
45d354ad82
Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN...
2016-07-29 22:58:39 +02:00
Laurent Destailleur
eafaa6f4dd
Fix doxygen
2016-07-29 17:30:33 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
27243069cb
FIX #5535 bad dependency.
...
Conflicts:
htdocs/fourn/facture/list.php
2016-07-29 15:19:04 +02:00
Sergio Sanchis Climent
2a4afb8195
FIX Notice: Trying to get property of non-object when update 3.9 -> 4.0
2016-07-29 15:13:12 +02:00
Laurent Destailleur
5d97ce038b
Fix page break when using a large html footer.
2016-07-28 23:58:13 +02:00
florian HENRY
7b72965315
FIX incoterms
2016-07-28 16:48:16 +02:00
florian HENRY
c13c15188b
FIX: incoterms do not output into crabe invoice PDF
2016-07-28 16:44:08 +02:00
Laurent Destailleur
f54946bacb
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-07-28 10:10:58 +02:00
Laurent Destailleur
889b15689b
FIX #5510
2016-07-27 19:42:09 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
799226728d
Fix default rule for margin is choice 3: so cost price, then pmp if not
...
defined, then bestu supplier price if not defined
2016-07-27 18:05:44 +02:00
Laurent Destailleur
c23fe43b62
Merge pull request #5556 from olsesacl/#5516
...
FIX #5516 PHP7 warning on supplier module's invoices configuration page
2016-07-27 11:15:21 +02:00
Laurent Destailleur
198adcf440
Merge pull request #5555 from olsesacl/#5515
...
FIX #5515 PHP7 warnings on project module's configuration page
2016-07-27 11:14:50 +02:00
Laurent Destailleur
51566970ce
Merge pull request #5554 from olsesacl/#5514
...
FIX #5514 PHP7 Warning on barcode module's configuration page
2016-07-27 11:13:49 +02:00
Maxime Kohlhaas
34b4d0225e
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-07-27 09:13:29 +02:00
Sergio Sanchis Climent
227c6906a8
FIX #5516
2016-07-26 23:26:29 +02:00
Sergio Sanchis Climent
3b57727542
PHP7 warnings on project module's configuration page
2016-07-26 22:22:55 +02:00
Sergio Sanchis Climent
c9fa12a8f9
PHP7 Warning on barcode module's configuration page
2016-07-26 22:09:06 +02:00
Sergio Sanchis Climent
7eed738fce
Fix: Accessing Direct Printing Jobs clears left menu
2016-07-26 21:53:03 +02:00
Laurent Destailleur
6d0ebbc4a3
Merge pull request #5424 from atm-florian/dev_fix5353
...
NEW #5353 IBAN and BIC should be now always mandatory for all country regarding accounting managment
2016-07-26 15:57:56 +02:00
Laurent Destailleur
a1c959e9d6
Merge pull request #5536 from defrance/patch-17
...
NEW add edition feature on action/agenda element
2016-07-26 15:29:45 +02:00
Laurent Destailleur
a3d0c01b68
Fix warning
2016-07-26 13:51:13 +02:00
florian HENRY
419dd3095b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
BENKE Charlie
e948002353
New : edition feature on action/agenda
2016-07-25 11:21:00 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
1624894346
Fix missing load
2016-07-21 19:35:45 +02:00
Laurent Destailleur
058c431483
FIX The project was lost when creating the event "sent by email". Also,
...
event company "create" was not tracked by default like others.
2016-07-21 13:49:10 +02:00
Laurent Destailleur
adc9c28369
Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model
...
New: Develop new add dorade model
2016-07-20 18:31:47 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e
Several minor fixes in expense reports
2016-07-16 15:21:38 +02:00
Laurent Destailleur
68227d91d9
FIX after enabling module expense report, the document template is not
...
active by default.
2016-07-16 14:14:28 +02:00
Laurent Destailleur
7263b29cb4
Merge pull request #5301 from atm-ph/fix_develop_issue_2858
...
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
Laurent Destailleur
9512bf1ac7
Add phpunit tests for option USE_STRICT_CSV_RULES
2016-07-15 12:30:24 +02:00
Laurent Destailleur
f7f812e11c
Merge pull request #5269 from defrance/patch-5
...
NEW Add option to generate strict CSV. Currently if \n or \r we replaced chars, now we can addquote too
2016-07-15 11:27:02 +02:00